--- /dev/null
+firefox-esr (78.4.1esr-2) unstable; urgency=medium
+
+ * Cargo.lock, third_party/rust/proc-macro2, third_party/rust/syn: Update
+ to fix FTBFS with rustc 1.47. bz#1663715.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 10 Nov 2020 10:23:12 +0900
+
+firefox-esr (78.4.1esr-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2020-49, also known as CVE-2020-26950.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 10 Nov 2020 07:27:07 +0900
+
+firefox-esr (78.4.0esr-2) unstable; urgency=medium
+
+ * debian/rules: Restore parts of debian/rules that were removed by mistake
+ in 78.4.0esr-1, causing FTBFS on at least amd64.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 21 Oct 2020 13:19:24 +0900
+
+firefox-esr (78.4.0esr-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2020-46, also known as:
+ CVE-2020-15969, CVE-2020-15683.
+
+ [Emilio Pozuelo Monfort]
+ * debian/browser.bug-presubj.in, debian/control.in, debian/rules,
+ debian/symbols.mk, debian/upstream.mk: Remove support for jessie.
+ * debian/control.in, debian/rules: stretch: build with LLVM 7, 4.0 doesn't
+ support -std=gnu++17.
+ * debian/rules:
+ - stretch: build with GCC 7 from gcc-mozilla.
+ - Call python with -B when regenerating the control files, so as to not
+ generate bytecode files.
+ - Call debian/l10n/gen with C.UTF-8 as the locale, otherwise it fails
+ in stretch when opening the iso-codes files.
+ - stretch: don't set NASM on !x86.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 21 Oct 2020 06:35:35 +0900
+
+firefox-esr (78.3.0esr-2) unstable; urgency=medium
+
+ * third-party/rust/authenticator/src/linux/ioctl_mips*.rs: Add missing
+ bindings for mips*.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 23 Sep 2020 12:53:29 +0900
+
+firefox-esr (78.3.0esr-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2020-43, also known as:
+ CVE-2020-15677, CVE-2020-15676, CVE-2020-15678, CVE-2020-15673.
+
+ * js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp: Add
+ CodeGenerator::visitWasmRegisterResult function. bz#1649655.
+ * js/src/jit/none/MacroAssembler-none.h: Bump CodeAlignment to 8.
+ bz#1666646.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 23 Sep 2020 07:25:27 +0900
+
+firefox-esr (78.2.0esr-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2020-32 and mfsa2020-38, also known as:
+ CVE-2020-15652, CVE-2020-6514, CVE-2020-15655, CVE-2020-15653,
+ CVE-2020-6463, CVE-2020-15656, CVE-2020-15658, CVE-2020-15654,
+ CVE-2020-15659, CVE-2020-15664, CVE-2020-15670.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 03 Sep 2020 09:30:52 +0900
+
+firefox (78.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fix for mfsa2020-28.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 10 Jul 2020 09:37:04 +0900
+
+firefox (78.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/rules:
+ - Replace --disable-ion with --disable-jit.
+ - Don't generated the ICU data file for big-endian manually.
+
+ * js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h,
+ js/src/jit/mips64/MacroAssembler-mips64-inl.h: Add branchTestSymbol
+ and fallibleUnboxPtr. bz#1642265.
+ * config/external/icu/data/*icudata*, config/external/icu/data/moz.build,
+ js/moz.configure: Unify the includion of the ICU data file. bz#1650299.
+ * config/external/icu/common/moz.build,
+ config/external/icu/common/sources.mozbuild,
+ config/external/icu/data/convert_icudata.py,
+ config/external/icu/data/moz.build,
+ config/external/icu/defs.mozbuild,
+ config/external/icu/i18n/moz.build,
+ config/external/icu/i18n/sources.mozbuild,
+ config/external/icu/icupkg/moz.build,
+ config/external/icu/icupkg/sources.mozbuild,
+ config/external/icu/moz.build,
+ config/external/icu/toolutil/moz.build,
+ config/external/icu/toolutil/sources.mozbuild,
+ config/recurse.mk,
+ intl/icu_sources_data.py: Automatically convert the little-endian ICU data
+ file for big-endian builds.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 03 Jul 2020 17:07:38 +0900
+
+firefox (78.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fixes for mfsa2020-24, also known as:
+ CVE-2020-12415, CVE-2020-12416, CVE-2020-12417, CVE-2020-12418,
+ CVE-2020-12419, CVE-2020-12420, CVE-2020-12421, CVE-2020-12422,
+ CVE-2020-12424, CVE-2020-12425, CVE-2020-12426.
+
+ * debian/control*: Bump nss build dependency.
+ * debian/control*, debian/rules: Remove build dependency on python2.7.
+ * debian/browser.mozconfig.in: Remove obsolete configure options.
+
+ * build/virtualenv_packages.txt: Don't install enum and enum34 virtualenv
+ packages in python3 virtualenvs. bz#1632429.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 01 Jul 2020 10:14:06 +0900
+
+firefox (77.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fixes for mfsa2020-20, also known as:
+ CVE-2020-12399, CVE-2020-12405, CVE-2020-12406, CVE-2020-12407,
+ CVE-2020-12408, CVE-2020-12409, CVE-2020-12410, CVE-2020-12411.
+
+ * debian/l10n/gen, debian/l10n_revs.py, debian/latest_nightly.py,
+ debian/rules, debian/symbols.mk: Convert to python 3.
+ * debian/control*: Bump nss and cbindgen build dependencies.
+ * debian/rules:
+ - Revert PKCS11 API change from 76.0.1-1 because the new API is
+ now explicitly used by upstream code.
+ - Stop passing -fno-schedule-insns2 -fno-lifetime-dse and
+ -fno-delete-null-pointer-checks to GCC.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 03 Jun 2020 07:53:04 +0900
+
+firefox (76.0.1-2) unstable; urgency=medium
+
+ * debian/browser.mozconfig.in: Allow addon sideload. Closes: #960084.
+ * debian/control*: Bump nasm build dependency to 2.14.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 15 May 2020 09:10:36 +0900
+
+firefox (76.0.1-1) unstable; urgency=medium
+
+ * New upstream release
+
+ * debian/rules: Force using old PKCS11 API when building against newer
+ NSS releases. Closes: #960012.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 13 May 2020 09:09:57 +0900
+
+firefox (76.0-2) unstable; urgency=medium
+
+ * Cargo.lock, third_party/rust/typenum/*: Upgrade typename to 1.12.0.
+ bz#1635671. Fixes FTBFS on i386.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 06 May 2020 14:27:30 +0900
+
+firefox (76.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fixes for mfsa2020-16, also known as:
+ CVE-2020-12387, CVE-2020-6831, CVE-2020-12390, CVE-2020-12391,
+ CVE-2020-12392, CVE-2020-12394, CVE-2020-12395, CVE-2020-12396.
+
+ * debian/control*: Bump nss build dependency.
+ * debian/browser.install.in: Don't install blocklist.xml, it's not there
+ anymore.
+
+ * config/recurse.mk: Don't depend on in-tree NSS/NSPR when building against
+ system NSS/NSPR. bz#1634926.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 06 May 2020 05:41:56 +0900
+
+firefox (75.0-2) unstable; urgency=medium
+
+ * build/moz.configure/util.configure: In configure, pass extra compiler
+ flags after source path. Fixes FTBFS with --with-system-libvpx with
+ gcc-9 >= 9-20190125-2.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 19 Apr 2020 09:03:28 +0900
+
+firefox (75.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fixes for mfsa2020-12, also known as:
+ CVE-2020-6821, CVE-2020-6822, CVE-2020-6823, CVE-2020-6824,
+ CVE-2020-6825, CVE-2020-6826.
+
+ * debian/control*: Bump nss, rustc, cargo, cbindgen and nodejs build
+ dependencies.
+ * debian/control*, debian/rules: Build against libvpx >= 1.8. We used
+ to build-conflicts with that version, but that's not necessary now
+ that upstream needs that version.
+ * debian/browser.install.in: Don't install .chk files, they aren't
+ produced anymore.
+ * debian/browser.install.in, debian/browser.mozconfig.in, debian/control*,
+ debian/rules: Don't build against system sqlite. This is not supported
+ anymore.
+
+ * python/mozbuild/mozbuild/nodeutil.py: Allow to build with older
+ versions of nodejs 10.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 08 Apr 2020 09:41:38 +0900
+
+firefox (74.0.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fixes for mfsa2020-11, also known as: CVE-2020-6819, CVE-2020-6820.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 04 Apr 2020 06:42:37 +0900
+
+firefox (74.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2020-08, also known as:
+ CVE-2020-6805, CVE-2020-6806, CVE-2020-6807, CVE-2020-6808,
+ CVE-2020-6809, CVE-2020-6810, CVE-2020-6811, CVE-2019-20503,
+ CVE-2020-6812, CVE-2020-6813, CVE-2020-6814, CVE-2020-6815.
+
+ * debian/rules:
+ - Use the -o flag to redirect preprocessor output rather than shell
+ redirection to work around bz#1621465.
+ - Remove obj-*/.mozbuild on clean.
+ * debian/control*: Bump nspr, nss, sqlite and cbindgen build dependencies.
+
+ * config/mozunit/mozunit/mozunit.py,
+ python/mozbuild/mozbuild/action/langpack_manifest.py,
+ python/mozbuild/mozbuild/jar.py, python/mozbuild/mozbuild/preprocessor.py,
+ python/mozbuild/mozbuild/test/backend/test_build.py: Use io.open() rather
+ than open() in mozbuild/preprocessor.py. bz#1613263.
+ * dom/canvas/ClientWebGLContext.h, dom/canvas/WebGLContext.h: Fix build
+ errors with -Werror=format-security with GCC.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 11 Mar 2020 12:15:37 +0900
+
+firefox (73.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * gfx/2d/SwizzleNEON.cpp: Fix NEON compile error with gcc and RGB unpacking.
+ bz#1610814.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 20 Feb 2020 09:07:58 +0900
+
+firefox (73.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2020-05, also known as:
+ CVE-2020-6796, CVE-2020-6798, CVE-2020-6800, CVE-2020-6801.
+
+ * debian/control*: Bump nss, rustc, cargo and cbindgen build dependencies.
+ * debian/browser.install.in: Do not install now removed chrome.manifest
+ and libnssdbm3.* files.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 12 Feb 2020 06:57:23 +0900
+
+firefox (72.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 22 Jan 2020 12:06:25 +0900
+
+firefox (72.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fix for mfsa2020-03, also known as CVE-2019-17026.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 09 Jan 2020 06:46:44 +0900
+
+firefox (72.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2020-01, also known as:
+ CVE-2019-17016, CVE-2019-17017, CVE-2019-17020, CVE-2019-17022,
+ CVE-2019-17023, CVE-2019-17024, CVE-2019-17025.
+
+ * debian/rules:
+ - Don't build with --compress-debug-sections on jessie.
+ - Use sourcestamp.txt for MOZ_BUILD_DATE.
+ - Avoid running dh_update_autotools_config. We're dealing with this
+ manually and we don't want config.* files being touched under
+ third_party/rust.
+ * debian/control*:
+ - Bump nspr, nss and sqlite build dependencies.
+ - Add missing dependency on libdrm-dev.
+ * debian/browser.mozconfig.in: Explicitly build with wayland support
+ enabled.
+
+ * intl/icu_sources_data.py: Don't build ICU in parallel.
+ * gfx/skia/skia/third_party/skcms/src/Transform_inl.h: Work around older
+ GCC ICE on arm.
+ (Thanks Emilio Pozuelo Monfort)
+
+ -- Mike Hommey <glandium@debian.org> Wed, 08 Jan 2020 08:54:04 +0900
+
+firefox (71.0-2) unstable; urgency=medium
+
+ * dom/indexedDB/ActorsParent.cpp: Work around lack of support for
+ http://eel.is/c++draft/class.temporary#6.7 in compilers. bz#1601707
+ Closes: #946249, #946547.
+ * layout/generic/WritingModes.h, servo/ports/geckolib/cbindgen.toml:
+ Fix build with newer cbindgen. bz#1602358.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 12 Dec 2019 09:38:33 +0900
+
+firefox (71.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-36, also known as:
+ CVE-2019-11756, CVE-2019-17008, CVE-2019-11745, CVE-2019-17014,
+ CVE-2019-17010, CVE-2019-17005, CVE-2019-17011, CVE-2019-17012,
+ CVE-2019-17013.
+
+ * debian/l10n/gen: Add support for ca-valencia.
+ * debian/control*: Bump nspr, nss, rustc and cargo build dependencies.
+ * debian/rules, debian/control.in:
+ - Build with nodejs-mozilla on jessie and stretch.
+ - Build with nasm-mozilla on jessie and stretch.
+ - Don't build with system libvpx on stretch.
+ (Thanks Emilio Pozuelo Monfort)
+
+ -- Mike Hommey <glandium@debian.org> Wed, 04 Dec 2019 10:09:38 +0900
+
+firefox (70.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 09 Nov 2019 07:53:49 +0900
+
+firefox (70.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-34, also known as:
+ CVE-2018-6156, CVE-2019-15903, CVE-2019-11757, CVE-2019-11759,
+ CVE-2019-11760, CVE-2019-11761, CVE-2019-11762, CVE-2019-11763,
+ CVE-2019-11765, CVE-2019-17000, CVE-2019-17001, CVE-2019-17002,
+ CVE-2019-11764.
+
+ * debian/control*: Bump nss, sqlite, rustc, cargo, and cbindgen build
+ dependencies.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 23 Oct 2019 07:30:42 +0900
+
+firefox (69.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 08 Oct 2019 08:06:31 +0900
+
+firefox (69.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fix for mfsa2019-31, also known as CVE-2019-11754.
+
+ * debian/control*:
+ - Bump nss, rustc, cargo and cbindgen build dependencies. Closes: #939412.
+ - Remove build dependency versions where Debian has had the right version
+ since Jessie.
+ * debian/source/lintian-overrides: Adjust DotZlib.chm path.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 24 Sep 2019 06:39:36 +0900
+
+firefox (69.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-25, also known as:
+ CVE-2019-11746, CVE-2019-11744, CVE-2019-11742, CVE-2019-11752,
+ CVE-2019-9812, CVE-2019-11741, CVE-2019-11743, CVE-2019-11748,
+ CVE-2019-11749, CVE-2019-5849, CVE-2019-11750, CVE-2019-11737,
+ CVE-2019-11738, CVE-2019-11747, CVE-2019-11734, CVE-2019-11735,
+ CVE-2019-11740.
+
+ * debian/upstream.mk: Read source repo and revision from json when
+ getting upstream info. Instead of the .txt file that doesn't exist
+ as of 69.
+ * debian/control*:
+ - Remove unused build dependency against python-ply.
+ - Remove python-minimal build dependency. All supported versions
+ of Debian have a new enough version.
+ - Remove build dependency against libjsoncpp-dev.
+ * debian/l10n/gen, debian/latest_nightly.py, debian/rules,
+ debian/symbols.mk, debian/upstream.mk, debian/watch: Use explicit
+ python2.7 instead of python.
+ * debian/rules: Use `mach python --no-virtualenv` to invoke the
+ preprocessor.
+
+ * config/system-headers,
+ toolkit/crashreporter/jsoncpp/src/lib_json/moz.build,
+ toolkit/crashreporter/minidump-analyzer/moz.build: Revert hack to
+ build against libjsoncpp. It was fine when it was only used by
+ the crash reporter, but that's not the case anymore, and it breaks
+ the build. Also, the bundled version is newer than what is available
+ in Debian.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 04 Sep 2019 13:48:54 +0900
+
+firefox (68.0.2-3) unstable; urgency=medium
+
+ * debian/control.in: Take source package name from preprocessing.
+
+ * build/moz.configure/old.configure: Avoid race condition creating
+ old-configure. bz#1574761.
+ * dom/media/systemservices/CamerasChild.cpp,
+ dom/media/systemservices/CamerasParent.cpp,
+ dom/media/systemservices/VideoEngine.cpp,
+ dom/media/webrtc/MediaEngineRemoteVideoSource.cpp: Don't use
+ __PRETTY_FUNCTION__ or __FUNCTION__ as format strings. bz#1531309.
+ Closes: #925680.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 18 Aug 2019 20:47:26 +0900
+
+firefox (68.0.2-2) unstable; urgency=medium
+
+ * debian/rules: Fix MOZ_APP_REMOTINGNAME. Upstream build system changes
+ made the config.status editing trick stop working. Export the variable for
+ configure to pick it instead. Closes: #932256
+
+ -- Mike Hommey <glandium@debian.org> Sun, 18 Aug 2019 08:41:43 +0900
+
+firefox (68.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-24, also known as CVE-2019-11733.
+
+ * debian/control*, debian/rules: Don't build against system vpx >= 1.8.0.
+ It has API changes that cause FTBFS.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 15 Aug 2019 08:06:59 +0900
+
+firefox (68.0.1-2) unstable; urgency=medium
+
+ * debian/rules: Work around https://github.com/rust-lang/cargo/issues/7147.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 19 Jul 2019 10:51:09 +0900
+
+firefox (68.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/rules:
+ - Hook stamps/dh_install-l10n to override_dh_install-indep rather than
+ binary-indep.
+ - Pass make job server down through dh_auto_build.
+ * debian/rules, debian/dh: Wrap dh to ensure debian/rules is invoked with
+ parallelism.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 19 Jul 2019 07:53:19 +0900
+
+firefox (68.0-3) unstable; urgency=medium
+
+ * debian/browser.README.Debian.in: Fix a reference to iceweasel in
+ README.Debian. Thanks Edward Betts.
+ * debian/rules:
+ - Only exclude "-g" from dpkg-buildflags output. All the other flags
+ that used to be excluded either already match upstream or add
+ reproducibility.
+ - Don't unexpectedly reset LDFLAGS.
+ - [firefox-esr] Remove iceweasel transitional packages on bullseye.
+ - Disable dh_strip_nondeterminism. Upstream build system already avoids
+ non-determinism it would strip, so there is no need for it further
+ modifying files.
+ - Avoid arch:all builds building arch:any stuff.
+ - Move AUTOCONF_DIRS cleanup after dh_clean.
+ - Add rust flags to improve reproducibility.
+ - Only touch or remove configure when it wasn't there to begin with.
+ - Call configure using its full path.
+ - Factor common configure arguments.
+ - Build langpacks with --disable-compile-environment, and pass less
+ configure arguments.
+ - Build each langpack from a separate build directory. This means time
+ wasted running configure more times, but all locales can now be built
+ in parallel.
+ * debian/symbols.mk, debian/symbols.apt.conf, debian/symbols.sources.list:
+ Miscellaneous changes to symbols download script.
+ * debian/make.mk: Exclude symbols.mk variables from dump output.
+ * debian/browser.mozconfig.in: Remove redundant --prefix=/usr.
+ * debian/control.in, debian/rules, debian/symbols.mk, debian/upstream.mk:
+ Remove packaging scripts compatibility with Wheezy.
+
+ * moz.configure: Only add confvars.sh as a dependency to config.status
+ when it exists. bz#1560340.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 14 Jul 2019 15:20:45 +0900
+
+firefox (68.0-2) unstable; urgency=medium
+
+ * debian/rules, debian/upstream.mk: Account for next Debian release.
+ * debian/rules, debian/control: Build against system sqlite again.
+
+ * gfx/skia/skia/third_party/skcms/src/Transform_inl.h: Work around GCC ICE
+ on mips*, i386 and s390x. Closes: #931757
+ * python/mozbuild/mozbuild/action/langpack_manifest.py: Use build id as
+ langpack version for reproducibility. bz#1565504.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 12 Jul 2019 20:37:51 +0900
+
+firefox (68.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-21, also known as:
+ CVE-2019-9811, CVE-2019-11711, CVE-2019-11712, CVE-2019-11713,
+ CVE-2019-11714, CVE-2019-11715, CVE-2019-11716, CVE-2019-11717,
+ CVE-2019-11718, CVE-2019-11720, CVE-2019-11721, CVE-2019-11730,
+ CVE-2019-11723, CVE-2019-11724, CVE-2019-11725, CVE-2019-11727,
+ CVE-2019-11728, CVE-2019-11710, CVE-2019-11709.
+
+ * debian/control*: Bump nss, sqlite, rustc, cargo and cbindgen build
+ dependencies. Remove Build-Conflicts with nss 3.44-1, since we now
+ build-depend on a more recent version.
+ * debian/rules, debian/control: Don't build against system sqlite, as
+ Debian doesn't have the required version yet.
+ * [firefox-esr] debian/l10n/browser-l10n.control*, debian/l10n/gen:
+ Don't generate iceweasel l10n transition packages for locales that
+ were never offered with iceweasel.
+ * debian/control, debian/l10n/browser-l10n.control.in: Add transition
+ dependencies for Bengali l10n. There is now only one Bengali l10n
+ package instead of two.
+ * debian/rules: Disable JIT at build time on mips because it fails to build.
+
+ * build/gyp.mozbuild: Revert patch that disables libyuv assembly on
+ mips64. It apparently compiles, now.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 10 Jul 2019 08:22:05 +0900
+
+firefox (67.0.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-19, also known as CVE-2019-11708.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 20 Jun 2019 11:05:27 -0700
+
+firefox (67.0.3-2) unstable; urgency=medium
+
+ * python/mozbuild/mozbuild/action/node.py: Attempt to work around make issue
+ happening on arch: all buildd.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 19 Jun 2019 13:16:37 -0700
+
+firefox (67.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-18, also known as CVE-2019-11707.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 18 Jun 2019 11:35:40 -0700
+
+firefox (67.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 12 Jun 2019 06:01:15 +0900
+
+firefox (67.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 05 Jun 2019 07:14:08 +0900
+
+firefox (67.0-4) unstable; urgency=medium
+
+ * debian/rules: Work around FTBFS on mips* by disabling webrtc
+ Build fails because of missing configurations for mips*.
+ * debian/control*: Build-Conflicts with libnss3-dev 2:3.44-1.
+ Closes: #929846.
+
+ * js/src/jit/mips32/MacroAssembler-mips32-inl.h: Fix FTBFS on mips/mipsel.
+ bz#1556197.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 02 Jun 2019 13:13:13 +0900
+
+firefox (67.0-3) unstable; urgency=medium
+
+ * media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc: Remove
+ WebRtc_GetCPUFeaturesARM from cpu_features.cc. It is already in
+ cpu_features_linux.c (and is not in cpu_features.cc in webrtc upstream).
+ Fixes FTBFS on armhf. bz#1523162.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 01 Jun 2019 13:44:05 +0900
+
+firefox (67.0-2) unstable; urgency=medium
+
+ * debian/extra-stuff/addonsInfo.jsm:
+ - Avoid running -dumps-addons-info without a running Firefox counting as a
+ crash.
+ - Support addons in resource:// locations in -dump-addons-info
+
+ * js/src/wasm/WasmSignalHandlers.cpp: Include struct definitions for
+ user_vfp and user_vfp_exc. Fixes FTBFS on armhf. bz#1526653.
+ * js/src/jit/mips*/MacroAssembler-mips*-inl.h,
+ js/src/jit/mips*/Trampoline-mips*.cpp: Fix functions: branchTestBigInt,
+ negPtr, generateVMWrapper on MIPS. bz#1544631.
+ * toolkit/modules/sessionstore/PrivacyFilter.jsm: Update and harden form
+ data filtering for privacy to account for no data being passed in.
+ bz#1553413.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 01 Jun 2019 09:18:27 +0900
+
+firefox (67.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-13, also known as:
+ CVE-2019-9816, CVE-2019-9817, CVE-2019-9819, CVE-2019-9820,
+ CVE-2019-9821, CVE-2019-11691, CVE-2019-11692, CVE-2019-11693,
+ CVE-2019-7317, CVE-2019-11695, CVE-2019-11696, CVE-2019-11697,
+ CVE-2019-11698, CVE-2019-11699, CVE-2019-11701, CVE-2019-9814,
+ CVE-2019-9800.
+ * Upload to experimental because the required cbindgen is not available in
+ unstable.
+
+ * debian/control*: Bump nspr, sqlite, rustc, cargo and cbindgen build
+ dependencies.
+ * debian/extra-stuff/addonsInfo.*, debian/extra-stuff/moz.build,
+ debian/installer/package-manifest.browser, debian/rules:
+ Modernize addonsInfo per bz#1431533, bz#1432992, bz#1514594, bz#1524688,
+ etc.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 22 May 2019 09:28:01 +0900
+
+firefox (66.0.5-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Additional fixes for addon signature validation.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 08 May 2019 08:07:21 +0900
+
+firefox (66.0.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Fixes issues with addon signature validation. Closes: #928417.
+ Note: this didn't affect addons installed via Debian packages.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 05 May 2019 22:52:24 +0900
+
+firefox (66.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-09, also known as:
+ CVE-2019-9810, CVE-2019-9813.
+
+ * debian/control*: Bump nss, sqlite, rustc, cargo and cbindgen build
+ dependencies.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 24 Mar 2019 08:17:24 +0900
+
+firefox (66.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-07, also known as:
+ CVE-2019-9790, CVE-2019-9791, CVE-2019-9792, CVE-2019-9793,
+ CVE-2019-9795, CVE-2019-9796, CVE-2019-9797, CVE-2019-9799,
+ CVE-2019-9802, CVE-2019-9803, CVE-2019-9805, CVE-2019-9806,
+ CVE-2019-9807, CVE-2019-9809, CVE-2019-9808, CVE-2019-9789,
+ CVE-2019-9788.
+
+ * debian/browser.mozconfig.in: Adjust to the upstream change wrt Google
+ API key configure options.
+ * debian/control*: Add nasm build dependency on amd64 and i386.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 20 Mar 2019 18:35:38 +0900
+
+firefox (65.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-04, also known as:
+ CVE-2018-18356, CVE-2019-5795, CVE-2018-18511.
+
+ * debian/rules, debian/upstream.mk: Manually set the update channel.
+ Closes: #921381, #921121, #921654.
+ * debian/rules: Build with -mfp32 on mips and mipsel. This should fix the
+ FTBFS.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 14 Feb 2019 19:33:05 +0900
+
+firefox (65.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2019-01, also known as:
+ CVE-2018-18500, CVE-2018-18503, CVE-2018-18504, CVE-2018-18505,
+ CVE-2018-18506, CVE-2018-18502, CVE-2018-18501.
+
+ * debian/control*: Bump nss, sqlite, rustc, cargo and cbindgen build
+ dependencies.
+ * debian/browser.install.in: Install libmozwayland.so.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 30 Jan 2019 11:04:24 +0900
+
+firefox (64.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-29, also known as:
+ CVE-2018-12407, CVE-2018-17466, CVE-2018-18492, CVE-2018-18493,
+ CVE-2018-18494, CVE-2018-18495, CVE-2018-18496, CVE-2018-18497,
+ CVE-2018-18498, CVE-2018-12406, CVE-2018-12405.
+
+ * debian/rules, debian/browser.install.in: Properly copy the watermark
+ to /usr/share/icons/hicolor/symbolic/apps.
+ * debian/rules: Disable debug symbols on 32-bits architectures, that
+ requires too much memory.
+ * debian/browser.mozconfig.in:
+ - Remove --enable-pie option, it's the default, now.
+ - Remove --disable-nodejs now that it's required.
+ * debian/control*:
+ - Bump rustc, cargo, cbindgen, nss and sqlite dependencies.
+ - Add nodejs build dependency.
+ * debian/browser-symbolic.svg.in: Import the watermark used for the
+ symbolic icon in the debian/ directory.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 12 Dec 2018 09:26:47 +0900
+
+firefox (63.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/control*: Build depend on unversioned clang/llvm.
+ Closes: #912802.
+ * debian/rules: Use embedded libevent in backports. Closes: #910397.
+ * debian/rules: Use GNU gold linker on i386 because BFD ld fails to link
+ libxul.so (memory exhausted).
+
+ * build/unix/elfhack/test.c: Try to ensure the bss section of the
+ elfhack testcase stays large enough. bz#1505608.
+ * memory/build/mozjemalloc.cpp: Fix run sizes for size classes >= 16KB
+ on systems with large pages. bz#1507035. Closes: #911898.
+ * media/libaom/moz.build: Use NEON_FLAGS instead of VPX_ASFLAGS for
+ libaom neon code.
+ * gfx/cairo/libpixman/src/pixman-vmx.c: Protect #include <config.h> in
+ pixman-vmx.c like in other pixman-*.c files
+
+ -- Mike Hommey <glandium@debian.org> Mon, 26 Nov 2018 10:17:08 +0900
+
+firefox (63.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/google.key: Use new Google API key, courtesy of Francois Marier.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 02 Nov 2018 10:50:57 +0900
+
+firefox (63.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-26, also known as:
+ CVE-2018-12392, CVE-2018-12393, CVE-2018-12395, CVE-2018-12396,
+ CVE-2018-12397, CVE-2018-12398, CVE-2018-12399, CVE-2018-12401,
+ CVE-2018-12402, CVE-2018-12403, CVE-2018-12388, CVE-2018-12390.
+
+ * debian/control*:
+ - Bump nss dependency.
+ - Add build dependency on cbindgen.
+ * debian/browser.mozconfig.in: Disable nodejs until it's actually necessary.
+ * debian/rules: Add -Wl,--compress-debug-sections=zlib to LDFLAGS to work
+ around elfhack failing with unstripped binaries larger than 2GiB.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 24 Oct 2018 08:32:15 +0900
+
+firefox (62.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-24, also known as:
+ CVE-2018-12386, CVE-2018-12387.
+
+ * debian/extra-stuff/addonsInfo.js: Fixes to work with recent versions
+ of Firefox. Closes: #909056.
+ * debian/control*, debian/browser.mozconfig.in: Build ALSA support.
+ Closes: #864987, #900062, #908349
+
+ -- Mike Hommey <glandium@debian.org> Wed, 03 Oct 2018 16:21:53 +0900
+
+firefox (62.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-22, also known as CVE-2018-12385.
+ * Ignore locale change events for the search service on shutdown.
+ bz#1489820. Closes: #908932.
+
+ * debian/control*:
+ - Remove the sqlite and nss dependencies when not building against the
+ system libraries.
+ - Enforce nss, nspr and sqlite dependencies to the same versions as
+ build dependencies. There are subtle non-ABI differences between
+ versions that Firefox might be relying on (be it features, behavior
+ changes/fixes, etc.) and can cause subtle problems when older
+ versions are used. Closes: #908225, #908520.
+ - Add a suggestion for pulseaudio.
+ * debian/rules, debian/control: Add libavcodec-extra* packages to the list
+ of recommends. Closes: #909130
+
+ * js/src/jit/BaselineJIT.h: Disable baseline JIT when SSE2 is not supported
+ at runtime. bz#1492064. Closes: #908396, #908449.
+ * gfx/2d/Swizzle.cpp: Use Swizzle fallback when SSE2 is not supported.
+ bz#1492065. Closes: #877445.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 22 Sep 2018 09:02:25 +0900
+
+firefox (62.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-20, also known as:
+ CVE-2018-12377, CVE-2018-12378, CVE-2018-12383, CVE-2018-12375,
+ CVE-2018-12376.
+
+ * debian/control*:
+ - Bump nss and sqlite build dependencies.
+ - Build depend on llvm/clang 6.0 for buster. Closes: #906175.
+ * debian/browser.mozconfig.in, debian/control*, debian/rules: Remove
+ build dependency on libbz2-dev. It's not used anymore.
+ * debian/noinstall.in: Remove the dictionaries directory, not part
+ of the packaged Firefox anymore.
+ * debian/l10n/gen: Use iso-codes json data instead of XML when present.
+ Closes: #907611.
+
+ * widget/gtk/nsAppShell.cpp: Use remoting name for call to
+ gdk_set_program_class. Closes: #907574.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 06 Sep 2018 07:42:45 +0900
+
+firefox (61.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 19 Jul 2018 06:54:40 +0900
+
+firefox (61.0-2) unstable; urgency=medium
+
+ * debian/browser.mozconfig.in, debian/control*, debian/rules: Remove
+ build dependency on system libhunspell. Using system hunspell lacks
+ features required by Firefox. Next version of Firefox doesn't allow
+ to build against system hunspell anyways. Closes: #900469.
+ * debian/browser.links.in, debian/rules, debian/vendor.js: Use the
+ spellchecker.dictionary_path pref to set the hunspell directory.
+ * debian/browser.mozconfig.in: Allow unsigned addons in app and system
+ scopes.
+ * debian/rules: Work around the effect the above has on the
+ --{enable,with}-system-* check.
+ * debian/control*: Remove old conflicts. Thanks Sylvestre Ledru.
+ Closes: #882956.
+ * debian/l10n/recommends, debian/l10n/browser-l10n.control,
+ debian/control: Update dictionary recommendations, following these rules:
+ - Transitional myspell packages are not listed except when stable
+ doesn't have the corresponding hunspell package.
+ - Both hunspell and myspell packages are listed if they are different.
+ Closes: #813832, #825843
+ * debian/copyright, debian/rules: Refer to /usr/share/common-licenses/MPL*
+ instead of installing our own copy. Closes: #704303.
+ * debian/make.mk: Use the same code as dump target for the dump-% target.
+ * debian/control*, debian/rules: Add Recommends on all supported libavcodec
+ libraries for h264 playback. Closes: #901600.
+
+ * toolkit/modules/AppConstants.jsm, toolkit/modules/moz.build,
+ toolkit/moz.configure, toolkit/mozapps/extensions/internal/XPIInstall.jsm,
+ toolkit/mozapps/extensions/content/extensions.js,
+ toolkit/mozapps/extensions/internal/XPIDatabase.jsm: Change how addon
+ signature requirement relaxation is done. Closes: #899390.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 08 Jul 2018 10:39:03 +0900
+
+firefox (61.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-15, also known as:
+ CVE-2018-12359, CVE-2018-12360, CVE-2018-12361, CVE-2018-12358,
+ CVE-2018-12362, CVE-2018-5156, CVE-2018-12363, CVE-2018-12364,
+ CVE-2018-12365, CVE-2018-12371, CVE-2018-12366, CVE-2018-12367,
+ CVE-2018-12369, CVE-2018-12370, CVE-2018-5186, CVE-2018-5187,
+ CVE-2018-5188.
+
+ * debian/control*:
+ - Bump nss and sqlite build dependencies.
+ - Add a build dependency on python3.
+ * debian/browser.install.in: Adjust to upstream changes.
+ * debian/vendor.js: Relax the addon signature requirements.
+
+ * toolkit/mozapps/extensions/content/extensions.js,
+ toolkit/mozapps/extensions/internal/XPIDatabase.jsm: Allow to relax the
+ addon signature requirements.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 27 Jun 2018 10:25:44 +0900
+
+firefox (60.0.2-2) unstable; urgency=medium
+
+ * build/unix/elfhack/elfhack.cpp, build/unix/elfhack/inject.c,
+ build/unix/elfhack/test.c: Use run-time page size when changing mapping
+ permissions in elfhack injected code. bz#1470701. Closes: #902231.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 24 Jun 2018 09:23:16 +0900
+
+firefox (60.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-14, also known as CVE-2018-6126.
+
+ * debian/upstream.mk: Use the same logic for betas as for releases to find
+ the source.
+ * debian/browser.NEWS.in: Adjust to show the ESR version.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 08 Jun 2018 18:25:04 +0900
+
+firefox (60.0.1-5) unstable; urgency=medium
+
+ * gfx/skia/moz.build: Revert change from 60.0.1-4.
+ * dom/media/webaudio/blink/DenormalDisabler.h: Avoid using vmrs/vmsr on
+ armel.
+ * mfbt/LinuxSignal.h, mfbt/moz.build,
+ tools/profiler/core/platform-linux-android.cpp: Remove
+ MOZ_SIGNAL_TRAMPOLINE. bz#1463035.
+ * build/autoconf/arch.m4: Add -mfloat-abi=softfp to NEON_FLAGS when it makes
+ sense. bz#1463036.
+ * xpcom/string/moz.build: Use HAVE_ARM_NEON instead of BUILD_ARM_NEON for
+ nsUTF8UtilsNEON.cpp. bz#1463036.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 22 May 2018 08:01:55 +0900
+
+firefox (60.0.1-4) unstable; urgency=medium
+
+ * gfx/skia/moz.build: Don't build skia neon on armel.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 21 May 2018 07:58:43 +0900
+
+firefox (60.0.1-3) unstable; urgency=medium
+
+ * debian/browser.links.in: Remove /usr/lib/*/browser/icons symlink, leftover
+ after the removal of /usr/share/*/browser/icons. Closes: #893323.
+
+ * media/webrtc/trunk/moz.build: Only build webrtc neon on aarch64.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 20 May 2018 10:12:15 +0900
+
+firefox (60.0.1-2) unstable; urgency=medium
+
+ * third_party/rust/libc/.cargo-checksum.json,
+ third_party/rust/libc/src/unix/notbsd/linux/mod.rs,
+ third_party/rust/libc/src/unix/notbsd/linux/musl/mod.rs,
+ third_party/rust/libc/src/unix/notbsd/linux/other/mod.rs,
+ third_party/rust/libc/src/unix/notbsd/linux/s390x.rs: Apply upstream patch
+ to add struct ucred for Linux on MIPS.
+ * gfx/skia/skia/src/jumper/SkJumper_stages.cpp: Fix Skia build on arm64
+ linux with GCC. bz#1462868.
+ * intl/icu_sources_data.py: Add --disable-layoutex when running ICU
+ configure. bz#1462859.
+ * media/webrtc/trunk/gtest/moz.build: Link chromium_atomics to webrtc tests.
+ bz#1462873.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 19 May 2018 13:07:39 +0900
+
+firefox (60.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/control*: Remove mozplugger suggestion. Closes: #888396.
+ * debian/browser.install.in, debian/browser.mozconfig.in, debian/control.in,
+ debian/rules: Remove the option to build against gtk+2, it is not
+ supported anymore.
+ * debian/control*, debian/rules: Avoid hard dependency on libgtk2.0-0.
+ Closes: #885144.
+
+ * media/webrtc/trunk/moz.build: Attempt to fix building webrtc on non-x86.
+ * js/src/jit/mips-shared/LIR-mips-shared.h, js/src/jit/mips32/LIR-mips32.h,
+ js/src/jit/mips64/LIR-mips64.h: Fix FTBFS on mips*. bz#1444303.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 19 May 2018 07:25:23 +0900
+
+firefox (60.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-11, also known as
+ CVE-2018-5154, CVE-2018-5155, CVE-2018-5157, CVE-2018-5158,
+ CVE-2018-5159, CVE-2018-5160, CVE-2018-5152, CVE-2018-5153,
+ CVE-2018-5163, CVE-2018-5164, CVE-2018-5166, CVE-2018-5167,
+ CVE-2018-5168, CVE-2018-5169, CVE-2018-5172, CVE-2018-5173,
+ CVE-2018-5175, CVE-2018-5176, CVE-2018-5177, CVE-2018-5165,
+ CVE-2018-5180, CVE-2018-5181, CVE-2018-5182, CVE-2018-5151,
+ CVE-2018-5150.
+
+ * debian/control*:
+ - Bump nspr, nss, sqlite, rustc and cargo build dependencies.
+ - Update Maintainer and Vcs fields, moving off alioth.
+ * debian/browser.js.in, debian/vendor.js: Use the new syntax for
+ locked and sticky prefs.
+ * debian/browser.NEWS.in: Add a NEWS about the deprecation of lockPref.
+ * debian/rules: Automatically find the ICU data file name.
+ * debian/browser.mozconfig.in: Revert workaround for bz#1341234.
+ * debian/browser.install.in, debian/rules: Don't install the ICU data
+ file, it's linked as a data section in libxul.
+
+ * modules/libpref/parser/src/lib.rs: Adapt to upstream changes to
+ keep supporting lockPref() for transition purposes, now that upstream
+ has locked prefs out of the box.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 10 May 2018 09:36:46 +0900
+
+firefox (59.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-10, also known as CVE-2018-5148.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 27 Mar 2018 08:29:16 +0900
+
+firefox (59.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-08, also known as CVE-2018-5146, CVE-2018-5147.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 17 Mar 2018 13:48:08 +0900
+
+firefox (59.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-06, also known as:
+ CVE-2018-5127, CVE-2018-5128, CVE-2018-5129, CVE-2018-5130,
+ CVE-2018-5131, CVE-2018-5132, CVE-2018-5133, CVE-2018-5134,
+ CVE-2018-5135, CVE-2018-5136, CVE-2018-5137, CVE-2018-5140,
+ CVE-2018-5141, CVE-2018-5142, CVE-2018-5143, CVE-2018-5126,
+ CVE-2018-5125.
+
+ * debian/upstream.mk:
+ - Change how we find the source tarball for releases.
+ - Stop using milestone.py, it went away in this version.
+ * debian/control*: Bump nspr, nss, sqlite, rustc and cargo build
+ dependencies.
+ * debian/rules: Update ICU_DATA_FILE version.
+ * debian/browser.install.in, debian/browser.links.in, debian/rules: Take all
+ icons from chrome/icons/default/ now they are all there.
+ * debian/browser.install.in, debian/rules: Install watermark icon through
+ dh_install.
+ * debian/browser.js.in: Use the new intl.locale.requested instead of
+ intl.locale.matchOS.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 14 Mar 2018 08:30:34 +0900
+
+firefox (58.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fix for mfsa2018-05.
+
+ * debian/upstream.mk, debian/l10n_revs.py: Use l10n-changesets.json from the
+ source tree to find the l10n changesets.
+ * debian/usptream.mk: Stop using milestone.py, it goes away in version 59.
+
+ * intl/icu/source/i18n/digitlst.cpp: Apply part of
+ http://bugs.icu-project.org/trac/changeset/40603 to fix FTBFS with glibc
+ 2.26 on big endian platforms. Closes: #888638.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 30 Jan 2018 07:43:28 +0900
+
+firefox (58.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-02, also known as:
+ CVE-2018-5091, CVE-2018-5092, CVE-2018-5093, CVE-2018-5094,
+ CVE-2018-5095, CVE-2018-5097, CVE-2018-5098, CVE-2018-5099,
+ CVE-2018-5100, CVE-2018-5101, CVE-2018-5102, CVE-2018-5103,
+ CVE-2018-5104, CVE-2018-5105, CVE-2018-5106, CVE-2018-5107,
+ CVE-2018-5108, CVE-2018-5109, CVE-2018-5111, CVE-2018-5112,
+ CVE-2018-5113, CVE-2018-5114, CVE-2018-5115, CVE-2018-5116,
+ CVE-2018-5117, CVE-2018-5118, CVE-2018-5119, CVE-2018-5122,
+ CVE-2018-5090, CVE-2018-5089.
+
+ * debian/rules:
+ - Don't disable necko-wifi on kfreebsd/hurd. This used to be necessary
+ because that was using libiw, which was linux-only, but libiw is not
+ used anymore.
+ - Refresh configure files manually.
+ - Remove --with-default-mozilla-five-home, it's gone.
+ - Adapt to compare-locales changes.
+ - Define MOZ_FFVPX on arm and aarch64.
+ * debian/browser.install.in, debian/rules, debian/test.mk: Use
+ DEB_HOST_ARCH* instead of DEB_BUILD_ARCH*.
+ * debian/control*:
+ - Bump rustc, cargo and nss build dependencies.
+ - Add a dependency on libnss3 3.34 for the firefox package.
+ * debian/noinstall.in: Remove run-mozilla.sh from there, it's not installed
+ anymore.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 24 Jan 2018 08:16:43 +0900
+
+firefox (57.0.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2018-01, mitigating "Spectre" side-channel attack.
+
+ * debian/control*: Remove build dependencies on unused -dev packages.
+ * debian/rules: Clean l10n build directory.
+ * debian/installer/Makefile.in,
+ debian/installer/package-manifest.browser, debian/rules, moz.build:
+ Let upstream packaging step preprocess our package manifest, instead
+ of preprocessing it manually first.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 05 Jan 2018 15:55:05 +0900
+
+firefox (57.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 30 Dec 2017 12:06:22 +0900
+
+firefox (57.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2017-27, also known as:
+ * CVE-2017-7843, CVE-2017-7844.
+
+ * debian/rules: Don't pass unused variables during make install.
+ * debian/installer/Makefile.in: Small path correctness fixup.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 01 Dec 2017 14:35:58 +0900
+
+firefox (57.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2017-24, also known as:
+ CVE-2017-7828, CVE-2017-7830, CVE-2017-7831, CVE-2017-7832,
+ CVE-2017-7833, CVE-2017-7834, CVE-2017-7835, CVE-2017-7836,
+ CVE-2017-7837, CVE-2017-7838, CVE-2017-7839, CVE-2017-7840,
+ CVE-2017-7842, CVE-2017-7827, CVE-2017-7826.
+
+ * debian/control*: Bump nss, sqlite, rustc and cargo build dependencies.
+ * debian/rules:
+ - Always remove configure/old-configure during clean.
+ - Use a new file as source for the symbolic icon. Closes: #867729.
+ - Disable tests until they're fixed. The script to run tests uses old
+ entry points that weren't updated to deal with the sandbox in Firefox,
+ causing the tests to fail in a way that takes days to go through the
+ entire suites. Closes: #877565.
+ * debian/import-tar.py: Make python 3.6 happy.
+
+ * old-configure*: Allow to build against nspr 4.16.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 15 Nov 2017 09:20:05 +0900
+
+firefox (56.0-2) unstable; urgency=medium
+
+ * debian/browser.mozconfig.in: Pass NSPR directory to bindgen to workaround
+ bz#1341234.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 29 Sep 2017 13:28:38 +0900
+
+firefox (56.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2017-21, also known as:
+ CVE-2017-7793, CVE-2017-7818, CVE-2017-7819, CVE-2017-7824,
+ CVE-2017-7812, CVE-2017-7814, CVE-2017-7813, CVE-2017-7815,
+ CVE-2017-7816, CVE-2017-7821, CVE-2017-7823, CVE-2017-7822,
+ CVE-2017-7820, CVE-2017-7811, CVE-2017-7810.
+
+ * debian/control*:
+ - Bump nspr, nss, rustc and cargo build dependencies.
+ - Build depend on llvm-4.0-dev, libclang-4.0-dev and clang-4.0.
+ * debian/rules: Update ICU_DATA_FILE version.
+ * debian/browser.mozconfig.in, debian/google.key: Add the Google API key
+ from the chromium package for safebrowsing. Thanks Francois Marier.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 29 Sep 2017 07:51:07 +0900
+
+firefox (55.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/source/lintian-overrides: Add a lintian override for dotzlib.chm.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 09 Sep 2017 20:24:43 +0900
+
+firefox (55.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * js/src/jit/ExecutableAllocator.h, js/src/jit/none/MacroAssembler-none.h:
+ Fix Spidermonkey build with no jit backend. bz#1376268.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 23 Aug 2017 09:41:36 +0900
+
+firefox (55.0-2) unstable; urgency=medium
+
+ * ipc/chromium/src/base/message_pump_libevent.cc,
+ ipc/chromium/src/third_party/libevent/linux/event2/event-config.h:
+ Fix FTBFS on i386. bz#1388981.
+ * dom/base/nsWrapperCache.h: Fix FTBFS on powerpc64el. bz#1376277.
+ * media/libcubeb/cubeb-pulse-rs/src/backend/context.rs: Fix cubeb-pulse-rs
+ FTBFS on arm64.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 10 Aug 2017 14:29:21 +0900
+
+firefox (55.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2017-18, also known as:
+ CVE-2017-7798, CVE-2017-7800, CVE-2017-7801, CVE-2017-7809,
+ CVE-2017-7784, CVE-2017-7802, CVE-2017-7785, CVE-2017-7786,
+ CVE-2017-7806, CVE-2017-7753, CVE-2017-7787, CVE-2017-7807,
+ CVE-2017-7792, CVE-2017-7791, CVE-2017-7808, CVE-2017-7781,
+ CVE-2017-7794, CVE-2017-7803, CVE-2017-7799, CVE-2017-7783,
+ CVE-2017-7788, CVE-2017-7789, CVE-2017-7797, CVE-2017-7780,
+ CVE-2017-7779.
+
+ * debian/control*: Bump nspr, nss and sqlite build dependencies.
+ * debian/rules:
+ - Preserve Cargo.toml.orig files ; cargo doesn't like that dh_clean
+ removes them.
+ - Copy the MPL-2.0 license from nsprpub instead of b2g, the latter being
+ gone.
+ * debian/browser.js.in: Default to no suggestions in the urlbar. This still
+ brings a panel asking the user whether they want to opt-in on first use.
+ * debian/upstream.mk: Set DIST differently for experimental.
+
+ * media/webrtc/trunk/gtest/moz.build: Make webrtc-gtest build work with
+ system jpeg and libvpx. bz#1373988.
+ * media/mtransport/third_party/nICEr/nicer.gyp,
+ media/mtransport/third_party/nrappkit/nrappkit.gyp: Disable
+ -Wformat-security where -Wformat is disabled. bz#1388681. Closes: #871386.
+ ('ppc64le', 'Linux'): 'powerpc64le-unknown-linux-gnu',
+ * build/moz.configure/rust.configure: Add ppc64el target for rust code
+ (second attempt). Closes: #864822.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 09 Aug 2017 20:21:59 +0900
+
+firefox (54.0-2) unstable; urgency=medium
+
+ * debian/upstream.mk: Consider testing/unstable as buster, which implies
+ build depending on system nspr, nss, sqlite and hunspell again.
+ * debian/rules: Really make overrides with USE_SYSTEM_* set to nothing work.
+
+ * build/moz.configure/rust.configure: Add ppc64el target for rust code.
+ Closes: #864822.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 17 Jun 2017 07:20:23 +0900
+
+firefox (54.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2017-15, also known as:
+ CVE-2017-5472, CVE-2017-7749, CVE-2017-7750, CVE-2017-7751,
+ CVE-2017-7752, CVE-2017-7754, CVE-2017-7756, CVE-2017-7757,
+ CVE-2017-7778, CVE-2017-7758, CVE-2017-7762, CVE-2017-7764,
+ CVE-2017-5471, CVE-2017-5470.
+ * Targetting unstable because the required rustc version is available there,
+ and the freeze is almost over, meaning new versions of rustc will receive
+ updates, allowing to build newer versions of Firefox.
+
+ * debian/rules, debian/control.in: Switch to GCC 4.8 on wheezy.
+ * debian/rules: Don't remove debian/control on clean. Thanks to
+ Emilio Pozuelo Monfort for those two changes for wheezy LTS support.
+ * debian/control.in, debian/rules, debian/symbols.mk, debian/upstream.mk:
+ Rename the BACKPORT variable to DIST, and set it to "stretch" for
+ unstable/testing targetted builds.
+ * debian/rules: Normalize the system libraries used depending on the Debian
+ version.
+ * debian/control*:
+ - Bump nspr and build dependencies.
+ - Bump rustc and cargo build dependencies.
+ * debian/rules:
+ - Allow to override USE_SYSTEM_* variables from the environment.
+ - Remove rules to create mozilla-nspr.pc. It hasn't been shipped since
+ 45.0-1.
+ * debian/browser.install.in: Add the pingsender executable.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 14 Jun 2017 10:56:14 +0900
+
+firefox (53.0.is.53.0-1) experimental; urgency=medium
+
+ * The "oops, uploaded to unstable instead of experimental" release.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 20 Apr 2017 05:25:25 +0900
+
+firefox (53.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2017-10, also known as:
+ CVE-2017-5433, CVE-2017-5435, CVE-2017-5436, CVE-2017-5459,
+ CVE-2017-5466, CVE-2017-5434, CVE-2017-5432, CVE-2017-5460,
+ CVE-2017-5438, CVE-2017-5439, CVE-2017-5440, CVE-2017-5441,
+ CVE-2017-5442, CVE-2017-5464, CVE-2017-5443, CVE-2017-5444,
+ CVE-2017-5446, CVE-2017-5447, CVE-2017-5465, CVE-2017-5448,
+ CVE-2017-5454, CVE-2017-5455, CVE-2017-5456, CVE-2017-5469,
+ CVE-2017-5445, CVE-2017-5449, CVE-2017-5451, CVE-2017-5467,
+ CVE-2017-5453, CVE-2017-5458, CVE-2017-5468, CVE-2017-5430,
+ CVE-2017-5429.
+
+ * debian/control*:
+ - Bump nss and hunspell build dependencies.
+ * debian/browser-dev*, debian/control*, debian/noinstall.in,
+ debian/rules: Remove the -dev packages, there is no SDK provided
+ for Firefox anymore.
+ * debian/browser.install.in: Install manifest.json instead of clearkey.info.
+ * debian/rules:
+ - No system hunspell for backports.
+ - Build against system nspr/nss, experimental has the right versions.
+ * debian/browser.mozconfig.in, debian/control*, debian/rules: Always enable
+ rust, and bump the rustc dependency. As of version 54, it is not possible
+ to disable rust code anymore. While this is still version 53, there is not
+ much to win by keeping --disable-rust builds on Debian architectures
+ without rustc for 6 more weeks.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 19 Apr 2017 14:50:13 +0900
+
+firefox (52.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/browser.mozconfig.in, debian/mls.key: Enable geolocation using
+ Mozilla's Location Service. Closes: #726230.
+
+ * browser/app/profile/firefox.js: Use the Mozilla Location Service when
+ the Google Key is not there.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 02 Apr 2017 06:45:39 +0900
+
+firefox (52.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fix for mfsa2017-08, also known as CVE-2017-5428.
+
+ * debian/browser.lintian-overrides.in: Add a lintian override for NSPR and
+ NSS.
+ * debian/control*: Build depend on libjsoncpp-dev.
+
+ * config/system-headers,
+ toolkit/crashreporter/jsoncpp/src/lib_json/moz.build,
+ toolkit/crashreporter/minidump-analyzer/moz.build: Build against system
+ libjsoncpp.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 18 Mar 2017 08:49:59 +0900
+
+firefox (52.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2017-05, also known as:
+ CVE-2017-5400, CVE-2017-5401, CVE-2017-5402, CVE-2017-5403,
+ CVE-2017-5404, CVE-2017-5406, CVE-2017-5407, CVE-2017-5410,
+ CVE-2017-5408, CVE-2017-5412, CVE-2017-5413, CVE-2017-5414,
+ CVE-2017-5415, CVE-2017-5416, CVE-2017-5417, CVE-2017-5426,
+ CVE-2017-5427, CVE-2017-5418, CVE-2017-5419, CVE-2017-5420,
+ CVE-2017-5405, CVE-2017-5421, CVE-2017-5422, CVE-2017-5399,
+ CVE-2017-5398.
+
+ * debian/control*: Bump nss and sqlite build dependencies.
+ * debian/rules:
+ - Update ICU_DATA_FILE version.
+ - Don't build against system sqlite until we have the right version in
+ Debian.
+ * debian/browser.install.in:
+ - Install chrome.manifest, libmozsandbox.so and minidump-analyzer.
+ - Remove browser/components.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 08 Mar 2017 10:24:05 +0900
+
+firefox (51.0.1-3) unstable; urgency=medium
+
+ * js/src/jit/mips-shared/Assembler-mips-shared.h,
+ js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp,
+ js/src/jit/mips-shared/CodeGenerator-mips-shared.h,
+ js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h,
+ js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp,
+ js/src/jit/mips-shared/MacroAssembler-mips-shared.h,
+ js/src/jit/mips32/MacroAssembler-mips32-inl.h,
+ js/src/jit/mips32/MacroAssembler-mips32.cpp,
+ js/src/jit/mips32/MacroAssembler-mips32.h,
+ js/src/jit/mips64/MacroAssembler-mips64-inl.h,
+ js/src/jit/mips64/MacroAssembler-mips64.cpp,
+ js/src/jit/mips64/MacroAssembler-mips64.h: Apply patch from
+ bz#1303688 hopefully fixing the FTBFS on mips*.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 23 Feb 2017 16:34:17 +0900
+
+firefox (51.0.1-2) unstable; urgency=medium
+
+ * debian/symbols.mk:
+ - Better handle downloading symbols from packages with epochs.
+ - Don't filter file names when getting symbols.
+ - Add experimental buildd apt source for symbols download.
+ - Avoid apt-get download being re-run when the file is already there.
+ - Adjust DBGTYPE depending on package version, not whether it's a
+ backport.
+ - Only dump symbols for files of type application/x-sharedlib.
+ This covers binary executables too because they are PIE and
+ undistinguishable from shared libraries as a consequence.
+ * debian/rules:
+ - Add -fno-schedule-insns2 back. Closes: #854258.
+ - Build with -fno-schedule-insns on armel and armhf when building with
+ GCC6. Closes: #854640.
+ - Hack to disable --gc-sections when building NSS, working around bug
+ #844357 again. Should fix FTBFS on mips*.
+ * debian/browser.desktop.in, debian/rules: Followup for the StartupWMClass
+ changes in 51.0.1-1: Use the same name in desktop file and
+ application.ini RemotingName. Closes: #854397.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 18 Feb 2017 08:17:22 +0900
+
+firefox (51.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/browser.desktop.in:
+ - Use the application name as StartupWMClass in the desktop file.
+ Along the change to nsAppRunner.cpp, this prevents e.g. GNOME Shell
+ from making Firefox appear as Firefox ESR when both are used.
+ - Remove Encoding key from desktop file. Closes: #812493
+ * debian/rules: Remove -fno-schedule-insns2 and add -fno-lifetime-dse
+ when building with GCC6.
+ * debian/rules, debian/control*: Build with GCC6 on arm*.
+ Closes: #852009. AFAIK, that will lead to FTBFS on at least armhf,
+ but let's already see how it goes.
+ * debian/upstream.mk: Use pkg-info.mk to figure out source name and version.
+ Closes: #850720.
+ * debian/control*:
+ - Remove build dependency and suggest on libgnome*. It hasn't actually
+ been used for a long time. Closes: #850265.
+ - Bump Standards-Version to 3.9.8. No changes required.
+ - Bump libvpx build dependency.
+ * debian/rules: Resize the symbolic icon.
+ * Move the -l10n-all package to the metapackages section. Closes: #824784.
+ * debian/browser.postrm.in, debian/browser.preinst.in, debian/rules: Don't
+ install preinst and postrm at all for the firefox package.
+ * debian/symbols.apt.conf, debian/symbols.mk, debian/symbols.sources.list:
+ Add scripts to create symbols archive to upload to Mozilla crash servers.
+ * debian/browser-dev.links.in, debian/browser.install.in,
+ debian/browser.mozconfig.in, debian/control*, debian/make.mk, debian/rules:
+ Add more granularity as to what system libraries are used
+ and only disable NSPR/NSS until we have the right versions in Debian.
+
+ * gfx/2d/BorrowedContext.h, gfx/layers/composite/LayerManagerComposite.*,
+ gfx/layers/moz.build: Fix --disable-skia builds. bz#1319374.
+ * gfx/skia/moz.build: Build Skia NEON code on arm64.
+ * toolkit/xre/nsAppRunner.cpp: Set program name from the remoting name.
+ * config/recurse.mk: Work around race condition between building NSPR and
+ NSS. bz#1115944, bz#1315882.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 05 Feb 2017 15:52:36 +0900
+
+firefox (51.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2017-01, also known as:
+ CVE-2017-5375, CVE-2017-5376, CVE-2017-5377, CVE-2017-5378,
+ CVE-2017-5379, CVE-2017-5380, CVE-2017-5390, CVE-2017-5389,
+ CVE-2017-5396, CVE-2017-5381, CVE-2017-5382, CVE-2017-5383,
+ CVE-2017-5384, CVE-2017-5385, CVE-2017-5386, CVE-2017-5391,
+ CVE-2017-5393, CVE-2017-5387, CVE-2017-5388, CVE-2017-5374,
+ CVE-2017-5373.
+
+ * debian/upstream.mk: Don't rely on FIREFOX_*_RELEASE tags to pull some
+ files to determine all source urls.
+ * debian/browser.bug-presubj.in: Add a note about submitting crash reports
+ upstream and pasting the url to Debian bug reports.
+ * debian/rules, debian/control*: Adjust rust build configure to new
+ upstream. It requires rustc >= 1.10 and cargo, the latter of which is
+ not available on arm64. Also depend on cargo >= 0.13, that doesn't access
+ the network with the Cargo.toml files in the source. Note rust code is
+ still not enabled unless building a beta release.
+ * debian/control*: Bump nspr, nss and sqlite build dependencies.
+ * debian/rules, debian/control: Use more embedded libraries until the
+ required versions of NSPR and NSS can be in unstable.
+
+ * build/moz.configure/rust.configure: Force use the i686 rust target.
+ * gfx/skia/skia/include/core/SkPreConfig.h: Generically set
+ SK_CPU_[BL]ENDIAN based on __BYTE_ORDER__ when available. bz#1319389.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 25 Jan 2017 11:27:12 +0900
+
+firefox (50.1.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2016-95, also known as:
+ CVE-2016-9894, CVE-2016-9899, CVE-2016-9895, CVE-2016-9896,
+ CVE-2016-9897, CVE-2016-9898, CVE-2016-9900, CVE-2016-9904,
+ CVE-2016-9901, CVE-2016-9902, CVE-2016-9903, CVE-2016-9080,
+ CVE-2016-9893.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 14 Dec 2016 06:15:10 +0900
+
+firefox (50.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2016-{91-92}, also known as:
+ CVE-2016-9078, CVE-2016-9079.
+
+ * widget/gtk/mozgtk/mozgtk.c: work around race in system Cairo's XShm usage.
+ bz#1271100.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 01 Dec 2016 08:32:08 +0900
+
+firefox (50.0-3) unstable; urgency=medium
+
+ * media/libjpeg/simd/jsimd_mips.c: Pull libjpeg-turbo upstream fix for FTBFS
+ on mips.
+ * widget/gtk/mozgtk/gtk3/moz.build: Work around Debian bug #844357.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 21 Nov 2016 08:16:53 +0900
+
+firefox (50.0-2) unstable; urgency=medium
+
+ * debian/rules: Use mach to run icu_source_data.py. This should fix FTBFS
+ on big endian platforms.
+
+ * js/src/jit/mips64/CodeGenerator-mips64.cpp: Fix
+ CodeGenerator::visitAsmSelectI64. bz#1290811.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 19 Nov 2016 06:16:41 +0900
+
+firefox (50.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2016-{87,89} also known as:
+ CVE-2016-5287, CVE-2016-5288, CVE-2016-5296, CVE-2016-5292,
+ CVE-2016-5297, CVE-2016-9064, CVE-2016-9066, CVE-2016-9067,
+ CVE-2016-9068, CVE-2016-9075, CVE-2016-9077, CVE-2016-5291,
+ CVE-2016-9070, CVE-2016-9073, CVE-2016-9076, CVE-2016-9063,
+ CVE-2016-9071, CVE-2016-5289, CVE-2016-5290.
+
+ * debian/rules: Only generate configure files on nightlies, and use
+ client.mk to generate them instead of using autoconf manually (which,
+ while compatible, is wrong nowadays).
+ * debian/control*:
+ - Remove outdated alternative build dependencies.
+ - Bump sqlite and nss build dependency.
+ - Add build dependency on libx11-xcb-dev.
+ * debian/browser.mozconfig.in, debian/control*, debian/rules: Enable rust on
+ non-release/ESR.
+ * debian/browser.install.in: Add the EmojiOneMozilla font.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 16 Nov 2016 09:04:23 +0900
+
+firefox (49.0-5) unstable; urgency=medium
+
+ * debian/rules:
+ - Don't install crashreporter files on arm64, where it's not built. Should
+ fix FTBFS on arm64.
+ - Ship a symbolic icon from the silhouette icon from branding.
+ Closes: #832297.
+ - Remove old workaround for GCC 4.5 on armel.
+ - Remove old workarounds for ia64.
+ - Remove GENSYMBOLS_FLAGS, which hasn't been used for 5 years.
+ - Remove CMP_AWK, which hasn't been used since xulrunner packages were
+ removed.
+ - Remove dh_builddeb override forcing xz compression, which is the default
+ since dpkg 1.15.6.
+ - Remove old workaround for ppc64.
+ - Disable both baseline JIT and ion on mips via prefs.
+ * debian/rules, debian/control: Re-enable Gtk+3 to see how it goes.
+ Closes: #832301.
+
+ * security/sandbox/linux/SandboxFilter.cpp: Allow media plugins to call
+ madvise with MADV_FREE. bz#1303813. Closes: #838911.
+ * js/src/jit/AtomicOperations.h: Fix crashes in AtomicOperations-none on
+ s390x. Should fix FTBFS on s390x.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 29 Oct 2016 19:54:35 +0900
+
+firefox (49.0-4) unstable; urgency=medium
+
+ * debian/rules, dbeian/browser.install.in: Always install GMP clearkey.
+ Should fix FTBFSes on non-x86/x86-64, this time.
+ * debian/browser.js.in: Unset media.gmp-manager.url.override.
+ Closes: #838902.
+ * debian/compat, debian/control*: Bump debhelper compat and dependency to 9.
+ * debian/rules, debian/control*: Generate debug symbols debs when not
+ backporting.
+ * debian/browser.install.in, browser.mozconfig.in, debian/rules: Don't
+ disable the crash reporter.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 02 Oct 2016 13:28:11 +0900
+
+firefox (49.0-3) unstable; urgency=medium
+
+ * debian/browser.desktop.in: Use the full path to the real Firefox
+ executable in the .desktop file. Closes: #832298
+
+ * toolkit/moz.configure: Ensure we don't enable Widevine unintentionally.
+ bz#1299694. Should fix FTBFSes on non-x86/x86-64.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 25 Sep 2016 17:34:05 +0900
+
+firefox (49.0-2) unstable; urgency=medium
+
+ * debian/rules, debian/control*: Only force GCC 5 on arm when building for
+ stretch+.
+ * debian/browser.mozconfig.in, debian/browser.install.in, debian/rules:
+ Do not disable EME. Closes: #838478.
+ * debian/rules, debian/browser.install.in: Build and use big-endian ICU data
+ on big-endian architectures. Fixes FTBFS on big-endian architectures.
+
+ * build/autoconf/icu.m4: Allow to override ICU_DATA_FILE from the
+ environment.
+ * js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp: OdinMonkey: MIPS:
+ Fix nop-jump patching code. bz#1277478. Fixes FTBFS on mips*el.
+ * media/libjpeg/moz.build: Fix CPU_ARCH test for libjpeg on mips. Fixes
+ FTBFS on mips.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 25 Sep 2016 09:47:54 +0900
+
+firefox (49.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa-2016-85, also known as:
+ CVE-2016-2827, CVE-2016-5270, CVE-2016-5271, CVE-2016-5272,
+ CVE-2016-5273, CVE-2016-5276, CVE-2016-5274, CVE-2016-5277,
+ CVE-2016-5275, CVE-2016-5278, CVE-2016-5279, CVE-2016-5280,
+ CVE-2016-5281, CVE-2016-5282, CVE-2016-5283, CVE-2016-5284,
+ CVE-2016-5256, CVE-2016-5257.
+
+ * debian/control*, debian/rules: Compile with GCC 5 on testing/unstable
+ on arm* because of crashes when building with GCC 6. (FTBFS)
+ * debian/control*: Force build against libnss3-dev >= 2:3.26-2~, which fixed
+ its symbols file. Closes: #833719.
+
+ * build/gyp.mozbuild: Disable libyuv assembly on mips64. (FTBFS)
+
+ -- Mike Hommey <glandium@debian.org> Wed, 21 Sep 2016 10:30:16 +0900
+
+firefox (48.0-2) unstable; urgency=medium
+
+ * debian/rules: Build with -fno-schedule-insns2 and
+ -fno-delete-null-pointer-checks with GCC >= 6 because it miscompiles
+ Firefox. Closes: #836533.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 05 Sep 2016 07:25:54 +0900
+
+firefox (48.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa-2016-{62-68,70-81,83-84}, also known as:
+ CVE-2016-2836, CVE-2016-2835, CVE-2016-2830, CVE-2016-2838,
+ CVE-2016-2839, CVE-2016-5251, CVE-2016-5252, CVE-2016-0718,
+ CVE-2016-5254, CVE-2016-5255, CVE-2016-5258, CVE-2016-5259,
+ CVE-2016-5260, CVE-2016-5261, CVE-2016-5262, CVE-2016-2837,
+ CVE-2016-5263, CVE-2016-5264, CVE-2016-5265, CVE-2016-5266,
+ CVE-2016-5268, CVE-2016-5250.
+
+ * debian/control*: Bump nss and sqlite build dependencies.
+ * debian/rules: Remove --build from configure invocation.
+ * debian/browser.mozconfig.in: s/NATIVE/SYSTEM/. The variables set for
+ --enable-system flags have changed upstream.
+ * debian/browser.install.in, debian/browser.links.in: Don't install webapprt
+ files, they are gone.
+ * debian/browser.install.in:
+ - Install ICU data file.
+ - libfreebl3 changed name.
+ - Take mozicon128.png from dist/firefox instead of dist/bin.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 03 Aug 2016 09:45:22 +0900
+
+firefox (47.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 29 Jun 2016 19:25:53 +0900
+
+firefox (47.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa-2016-{49-52,54,56-60}, also known as:
+ CVE-2016-2815, CVE-2016-2818, CVE-2016-2819, CVE-2016-2821,
+ CVE-2016-2822, CVE-2016-2825, CVE-2016-2828, CVE-2016-2829,
+ CVE-2016-2831, CVE-2016-2832, CVE-2016-2833.
+
+ * debian/rules: Read default toolkit from old-configure.in, but still keep
+ Gtk+3 disabled.
+ * debian/upstream.mk: Use l10n_changesets.txt from last candidate build for
+ L10N_REV.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 08 Jun 2016 10:00:04 +0900
+
+firefox (46.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/control*: Remove build dependencies that were only required for the
+ iceweasel branding.
+ * debian/control*, debian/browser.mozconfig.in: Remove configure flags and
+ build dependencies related to gnomevfs. They have been ignored for close
+ to a year.
+ * debian/browser.mozconfig.in:
+ - Remove configure flags explicitly enabling gio, it has been enabled by
+ default for more than 3 years.
+ - Remove --enable-svg, the option has been ignored for more than 5 years.
+ - Remove --enable-mathml, the option has been ignored for more than 4
+ years.
+ - Remove --enable-pango, the option has been ignored for 2 years.
+ - Remove --disable-pedantic, the option has been ignored for 3 years.
+ - Remove --disable-long-long-warning, the option has been ignored for
+ almost 5 years.
+ - Remove --disable-gnomeui, it is the default.
+ - Remove --disable-mochitest, the option has been ignored for more than 7
+ years.
+ - Remove --disable-debug, it is the default.
+ - Remove --enable-canvas, the option has been ignored for more than 6
+ years.
+ - Remove --disable-installer, the option has been ignored for close to 4
+ years.
+ - Remove --disable-javaxpcom, the option has been ignored for close to 5
+ years.
+ - Remove --disable-elf-dynstr-gc, the option has been ignored for more
+ than 2 years.
+ - Remove --enable-url-classifier, it is the default.
+ - Remove --with-user-appdir=.mozilla, it is the default.
+ - Remove --enable-single-profile, the option has been ignored for more
+ than 7 years.
+ - Remove --disable-profilesharing, the option has been ignored for more
+ than 7 years.
+ * debian/rules: Use the mach compare-locales command for l10n.
+ * debian/upstream.mk, debian/watch: Remove "mozilla.org" from path in
+ archive.mozilla.org urls.
+ * debian/upstream.mk: Don't use get a separate source tarball for
+ compare-locales. There is a copy in-tree that we now use.
+ * debian/browser.desktop.in, debian/control*, debian/rules: Allow to
+ distinguish between firefox and firefox-esr. Closes: #821952.
+ * debian/control, debian/rules: Disable Gtk+3 for now. Closes: #822807.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 08 May 2016 09:11:06 +0900
+
+firefox (46.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2016-{39,42,44-48}, also known as:
+ CVE-2016-2807, CVE-2016-2806, CVE-2016-2804, CVE-2016-2811,
+ CVE-2016-2812, CVE-2016-2814, CVE-2016-2816, CVE-2016-2817,
+ CVE-2016-2808, CVE-2016-2820.
+
+ * debian/browser.install.in: Add ffmpeg vp9 libraries.
+ * debian/browser.lintian-overrides.in: Add a lintian override for
+ libmozavutil.so, which is not exactly libavutil.
+ * debian/control*: Bump nss and sqlite3 build dependencies.
+ * debian/browser.mozconfig.in, debian/control*, debian/rules: Remove
+ gstreamer dependencies and such, gstreamer support was removed upstream.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 27 Apr 2016 09:04:38 +0900
+
+firefox (45.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 13 Apr 2016 10:07:02 +0900
+
+firefox (45.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Disables Graphite font shaping library.
+
+ * debian/browser.js.in: Don't mention the pref subdirectory in
+ /etc/firefox*/firefox*.js. Also reword the comment there, and remove some
+ parts of it. Closes: #818322.
+ * debian/control*:
+ - Bump libvpx build dependency to 1.4.0. Closes: #818454.
+ - Switch Vcs-* fields to https urls.
+ - Point Vcs-* urls to the right branch.
+ * debian/rules: Add --exclude=.mkdir.done to TAR_CREATE_FLAGS.
+
+ * debian/control*, debian/firefox.in, debian/iceweasel.*,
+ debian/l10n/browser-l10n.control.in, debian/rules: Synchronize with the
+ firefox-esr source package.
+
+ * ipc/chromium/moz.build, ipc/chromium/src/build/build_config.h,
+ ipc/chromium/src/base/atomicops.h,
+ ipc/chromium/src/base/atomicops_internals_arm64_gcc.h: Add aarch64 support
+ for atomic operations. bz#1250403.
+ * ipc/chromium/atomics/moz.build, ipc/chromium/moz.build,
+ media/webrtc/signaling/test/common.build: Link chromium mutex-based
+ atomics implementation to webrtc signaling tests. bz#1257888. This should
+ fix the powerpc FTBFSes.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 19 Mar 2016 02:51:43 +0900
+
+firefox (45.0-1) unstable; urgency=medium
+
+ * New upstream non-ESR release.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 10 Mar 2016 13:43:34 +0900
+
+firefox-esr (45.0esr-1) unstable; urgency=medium
+
+ * Farewell, Iceweasel.
+ * New upstream release.
+ * Fixes for mfsa2016-{16-34,37}, also known as:
+ CVE-2016-1952, CVE-2016-1953, CVE-2016-1954, CVE-2016-1955,
+ CVE-2016-1956, CVE-2016-1957, CVE-2016-1958, CVE-2016-1959,
+ CVE-2016-1960, CVE-2016-1961, CVE-2016-1962, CVE-2016-1963,
+ CVE-2016-1964, CVE-2016-1965, CVE-2016-1967, CVE-2016-1968,
+ CVE-2016-1966, CVE-2016-1970, CVE-2016-1971, CVE-2016-1975,
+ CVE-2016-1976, CVE-2016-1973, CVE-2016-1974, CVE-2016-1977,
+ CVE-2016-2790, CVE-2016-2791, CVE-2016-2792, CVE-2016-2793,
+ CVE-2016-2794, CVE-2016-2795, CVE-2016-2796, CVE-2016-2797,
+ CVE-2016-2798, CVE-2016-2799, CVE-2016-2800, CVE-2016-2801,
+ CVE-2016-2802.
+
+ * debian/rules, debian/browser.install.in: Remove xpm icon. It was only
+ shipped for the menu file, which is not there anymore.
+ * debian/control*, debian/changelog: Rename the source package to
+ firefox-esr.
+ * debian/browser.install.in, debian/control*, debian/rules,
+ debian/upstream.mk, debian/vendor.js*: Remove the OFFICIAL_NAME variable
+ and adjust packaging code accordingly. Now all cases will be using the
+ official name, although in some cases the package name might be different.
+ * debian/rules: Remove epoch from l10n package names.
+ * debian/branding, debian/installer/package-manifest.browser, debian/rules,
+ debian/source/include-binaries: Remove debian/branding.
+ * debian/browser.postinst.in, debian/browser.prerm.in: Do not remove
+ compreg.dat, xpti.dat and .autoreg. Those files have not been created for
+ a long time, so no Debian "firefox" package will have created them.
+ * debian/browser.install.in, debian/browser.links.in, debian/rules: Remove
+ the default profile. It's going away for good in version 46 anyways, and
+ hasn't been provided upstream for a very long time.
+ * browser-dev.install.in, debian/libxul.pc.in, debian/mozilla-nspr.pc.in,
+ debian/mozilla-plugin.pc.in, debian/rules: Remove pkg-config files. They
+ don't exist upstream, and are obviously unused in Debian since libxul.pc
+ has been broken since version 40.0.
+ * debian/control*, debian/l10n/browser-l10n.control.in, debian/rules: Add
+ transitional packages when building firefox-esr.
+ * debian/upstream.mk: Remove -esr suffix from PRODUCT_NAME when downloading.
+ * debian/copyright: Update debian/copyright with some missing files.
+ * debian/browser.NEWS.in, debian/browser.README.Debian.in,
+ debian/firefox-esr.NEWS: Rearrange README and NEWS files. Removed outdated
+ information, moved the NTLM info from NEWS to README and added a NEWS file
+ for the transition off iceweasel.
+ * debian/browser.install.in, debian/browser.links.in: Move debsearch
+ searchplugin to usr/share/firefox{-esr,}/distribution/searchplugins.
+ * debian/browser.install.in, debian/browser.links.in: Move preferences from
+ /etc/firefox{-esr,}/pref to /etc/firefox{-esr,}.
+ * debian/control*: Bump nspr and nss build dependencies.
+ * debian/browser.mozconfig.in: Add --with-app-name option for firefox-esr.
+ * debian/browser.install.in:
+ - Don't install libmozgnome.so and corresponding manifests, it's gone.
+ - The default theme is now an XPI.
+ - Install features addons.
+ * debian/browser.preinst.in: Remove iceweasel diversion of /usr/bin/firefox.
+ * debian/rules, debian/removed_conffiles*: Remove all iceweasel conffiles.
+ * debian/source/lintian-overrides:
+ - Remove source package name so that the same file can be used for both
+ firefox and firefox-esr.
+ - Fix some existing lintian overrides to actually work.
+ - Add lintian overrides for new false positives.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 10 Mar 2016 08:43:16 +0900
+
+iceweasel (44.0.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fixes for mfsa2016-13, also known as CVE-2016-1949.
+
+ * debian/control*:
+ - Bump sqlite3 build dependency.
+ - Bump Standards-Version. No changes required.
+ * debian/copyright:
+ - Rename all BSD-n licenses to BSD-n-clause.
+ - Remove commas separating lines in Files and Copyright.
+ - Fixup some lintian warnings.
+ * debian/source/lintian-overrides: Add lintian overrides for various
+ "errors" in the source package. See associated comments.
+ * debian/rules: Avoid tar creating hard links with -h for symlinks pointing
+ to the same file.
+ * debian/browser.menu.in: Remove menu file.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 14 Feb 2016 18:25:51 +0900
+
+iceweasel (44.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2016-{01-04,06,09-11}, also known as:
+ CVE-2016-1930, CVE-2016-1931, CVE-2016-1933, CVE-2016-1935,
+ CVE-2016-1939, CVE-2016-1937, CVE-2016-1942, CVE-2016-1943,
+ CVE-2016-1944, CVE-2016-1945, CVE-2016-1946, CVE-2016-1947.
+
+ * js/src/jit/mips-shared/Architecture-mips-shared.h,
+ js/src/jit/mips-shared/Assembler-mips-shared.*,
+ js/src/jit/mips32/Architecture-mips32.*,
+ js/src/jit/mips32/Assembler-mips32.*,
+ js/src/jit/mips64/Architecture-mips64.*,
+ js/src/jit/mips64/Assembler-mips64.*: Fix build failure on mipsel.
+ bz#1213146.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 27 Jan 2016 11:12:44 +0900
+
+iceweasel (43.0.4-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/removed_conffiles: Add profile/bookmarks.html to the list of
+ removed conffiles. Closes: #809309.
+ * debian/removed_conffiles*, debian/rules: Add @browser@rc to the list of
+ removed conffiles. Closes: #809386.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 08 Jan 2016 08:03:06 +0900
+
+iceweasel (43.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/latest_nightly.py, debian/upstream.mk: Ensure aurora/nightly
+ versions match the requested one for `debian/rules download`.
+
+ * toolkit/mozapps/extensions/internal/XPIProvider.jsm: Simplify change
+ allowing unsigned addons in /usr/{lib,share}/mozilla/extensions.
+ * browser/components/migration/MigrationUtils.jsm,
+ browser/components/nsBrowserGlue.js, browser/installer/package-manifest.in,
+ browser/locales/Makefile.in: Move bookmarks.html to a chrome localized
+ location. bz#1235107.
+ * js/src/jit/mips-shared/Lowering-mips-shared.*,
+ js/src/jit/mips32/Lowering-mips32.h: Move LIRGeneratorMIPS::visitRandom to
+ architecture-specific: bz#1206591.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 28 Dec 2015 16:45:41 +0900
+
+iceweasel (43.0.1-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ * toolkit/mozapps/extensions/content/extensions.js,
+ toolkit/mozapps/extensions/internal/XPIProvider.jsm: Allow unsigned
+ addons in /usr/{lib,share}/mozilla/extensions when upgrading as well,
+ and avoid message about them not being verified in about:addons.
+ Closes: #808228.
+ * security/nss/lib/ckfw/builtins/certdata.txt: Remove the SPI Inc. and
+ CAcert.org CA certificates for backports. The former was removed in
+ NSS 3.21-1 and the latter in 3.16-1, and remained here largely
+ overlooked.
+ * media/webrtc/trunk/build/build_config.h: Add aarch64 macros. bz#1219566.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 19 Dec 2015 12:15:56 +0900
+
+iceweasel (43.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{134-149}, also known as:
+ CVE-2015-7201, CVE-2015-7202, CVE-2015-7204, CVE-2015-7207,
+ CVE-2015-7208, CVE-2015-7210, CVE-2015-7212, CVE-2015-7215,
+ CVE-2015-7211, CVE-2015-7218, CVE-2015-7219, CVE-2015-7216,
+ CVE-2015-7217, CVE-2015-7203, CVE-2015-7220, CVE-2015-7221,
+ CVE-2015-7205, CVE-2015-7213, CVE-2015-7222, CVE-2015-7223,
+ CVE-2015-7214.
+
+ * debian/control*: Bump nss build dependency.
+ * debian/rules:
+ - Follow upstream default for Gtk+2 vs. Gtk+3 automatically.
+ - Only extract defaults/{preferences,profile} from browser/omni.ja.
+ * debian/browser.install.in: Don't install libdbusservice.so, it's gone.
+
+ * toolkit/mozapps/extensions/internal/XPIProvider.jsm: Allow unsigned
+ addons in /usr/{lib,share}/mozilla/extensions. Closes: #800150.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 16 Dec 2015 10:56:36 +0900
+
+iceweasel (42.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{116-118,121-123,127-132}, also known as:
+ CVE-2015-4513, CVE-2015-4514, CVE-2015-4515, CVE-2015-4518,
+ CVE-2015-7187, CVE-2015-7188, CVE-2015-7189, CVE-2015-7193,
+ CVE-2015-7194, CVE-2015-7195, CVE-2015-7196, CVE-2015-7198,
+ CVE-2015-7199, CVE-2015-7200, CVE-2015-7197.
+
+ * debian/control*: Bump nspr, nss and sqlite build dependencies.
+ * debian/browser.install.in:
+ - Adapt to location change for the Gtk+2 wrapper library.
+ - Install liblgpllibs.so.
+ * debian/branding/content/Makefile.in: identity-icons-brand*.png were
+ replaced by a svg.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 04 Nov 2015 09:08:45 +0900
+
+iceweasel (41.0.2-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fix for mfsa2015-115, also known as CVE-2015-7184.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 16 Oct 2015 08:30:41 +0900
+
+iceweasel (41.0.1-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ * debian/watch: Update watch file to use https://archive.mozilla.org/ and xz
+ archives.
+
+ * toolkit/library/moz.build: Link libxul against libatomic when necessary.
+ bz#1178266.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 05 Oct 2015 09:38:16 +0900
+
+iceweasel (41.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{96,98,102-112}, also known as:
+ CVE-2015-4500, CVE-2015-4501, CVE-2015-4504, CVE-2015-4507,
+ CVE-2015-4508, CVE-2015-4510, CVE-2015-4511, CVE-2015-4509,
+ CVE-2015-4512, CVE-2015-4502, CVE-2015-4516, CVE-2015-4519,
+ CVE-2015-4520, CVE-2015-4521, CVE-2015-4522, CVE-2015-7174,
+ CVE-2015-7175, CVE-2015-7177.
+
+ * debian/control*: Bump sqlite build dependency.
+
+ * config/system-headers: Add a system header wrapper for
+ <freetype/ftfntfmt.h>. bz#1194520.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 23 Sep 2015 11:34:28 +0900
+
+iceweasel (40.0.3-3) experimental; urgency=medium
+
+ * debian/browser.js.in: Disable Health Report upload.
+
+ * build/autoconf/toolchain.m4: Fixup for libatomic detection.
+ * browser/components/preferences/applications.js,
+ uriloader/exthandler/nsHandlerService.js: Revert patch from 3.0.1-1
+ that doesn't seem useful anymore.
+ * browser/confvars.sh: Stop not building Health Report.
+ * l10n-ru/browser/chrome/browser-region/region.properties: Revert reordering
+ of mailto handlers.
+ * toolkit/components/search/nsSearchService.js: Revert change from 12.0-1 that
+ handled the transition to /etc/<appname>/searchplugins more gracefully
+ because that's not doing anything useful anymore.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 31 Aug 2015 11:32:14 +0900
+
+iceweasel (40.0.3-2) experimental; urgency=medium
+
+ * debian/rules, debian/removed_conffiles, debian/browser.postinst.in,
+ debian/browser.postrm.in, debian/browser.preinst.in: Remove past conffiles.
+ Closes: #795353.
+
+ * build/autoconf/toolchain.m4, mfbt/moz.build: Link against libatomic
+ when necessary to fix FTBFS on powerpc and mips.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 30 Aug 2015 20:08:08 +0900
+
+iceweasel (40.0.3-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{94-95}, also known as:
+ CVE-2015-4497, CVE-2015-4498.
+
+ * debian/import-tar.py, debian/repack.py, debian/upstream.mk:
+ Adjust debian/upstream.mk, debian/repack.py and debian/import-tar.py
+ to cope with xz source tarballs.
+ * debian/control*: Suggest Latin Modern Math instead of MathJax TeX fonts
+ for MathML rendering, and remove suggestion for Asana Math. Thanks
+ Frédéric Wang. Closes: #792012.
+ * debian/rules, debian/upstream.mk: Don't set LESS_SYSTEM_LIBS when
+ building a backport for stretch. Closes: #795331.
+ * debian/copyright: Fix typo in MPL 1.1 license version number.
+ Closes: #755802.
+ * debian/upstream.mk: Avoid latest_nightly.py being run every time
+ debian/rules is invoked for aurora builds.
+ * debian/rules, debian/control.in: Force build with GCC 4.7 when
+ backporting to wheezy.
+
+ * media/libvpx/moz.build: Build libvpx neon code without -mthumb and
+ -mfloat-abi=softfp. Closes: #795337.
+ * configure.in: Build libvpx neon code with -mfloat-abi=softfp on armel.
+ * media/libjpeg/simd/jsimd_mips_dspr2.S: Fix build error in MIPS SIMD
+ when compiling with -mfpxx.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 28 Aug 2015 18:49:49 +0900
+
+iceweasel (40.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{79-83,86-88,90-92}, also known as:
+ CVE-2015-4473, CVE-2015-4474, CVE-2015-4475, CVE-2015-4477,
+ CVE-2015-4478, CVE-2015-4479, CVE-2015-4480, CVE-2015-4493,
+ CVE-2015-4483, CVE-2015-4484, CVE-2015-4491, CVE-2015-4487,
+ CVE-2015-4488, CVE-2015-4489, CVE-2015-4490, CVE-2015-4492.
+
+ * debian/latest_nightly.py, debian/upstream.mk: Modify latest_nightly.py to
+ work without ftp now that it's gone.
+ * debian/upstream.mk: Switch to HTTPS for all hg.mozilla.org urls.
+ * debian/rules, debian/browser.install.in: Don't copy searchplugins to
+ /etc/iceweasel. They now are in chrome://.
+ * debian/browser.install.in: Don't install libmozalloc.so, it doesn't exist
+ anymore.
+
+ * toolkit/components/search/nsSearchService.js: Revert change from 32.0.3-1
+ that bumped the search engine max icon size to 35kB because it's not
+ needed anymore.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 12 Aug 2015 09:21:06 +0900
+
+iceweasel (39.0.3-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-78, also known as CVE-2015-4495.
+
+ * debian/source.filter: Remove the source tarball filtering of search plugin
+ icons. See 20150715221703.GD19084@glandium.org.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 07 Aug 2015 08:52:52 +0900
+
+iceweasel (39.0-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ * debian/branding/content/Makefile.in: Re-revert to non-ESR branding.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 03 Jul 2015 19:07:36 +0900
+
+iceweasel (38.1.0esr-2) unstable; urgency=medium
+
+ * debian/control*: Bump NSS build dependency.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 03 Jul 2015 15:26:43 +0900
+
+iceweasel (38.1.0esr-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{59-67,69}, also known as:
+ CVE-2015-2724, CVE-2015-2725, CVE-2015-2727, CVE-2015-2728,
+ CVE-2015-2729, CVE-2015-2731, CVE-2015-2730, CVE-2015-2722,
+ CVE-2015-2733, CVE-2015-2734, CVE-2015-2735, CVE-2015-2736,
+ CVE-2015-2737, CVE-2015-2738, CVE-2015-2739, CVE-2015-2740,
+ CVE-2015-2741, CVE-2015-2743.
+
+ * debian/rules: Use the right --target, --host and --build arguments to
+ configure for the Mozilla build system, which uses different meanings.
+ * debian/branding/firefox-branding.js: Add devtools.selfxss.count pref
+ to the iceweasel branding to match unofficial branding. Closes: #787975.
+ * debian/browser.js.in: Use a sticky pref for browser.newtabpage.enhanced.
+ * debian/branding/content/Makefile.in: Revert branding changes for SVG
+ wordmark, not used on ESR
+
+ * modules/libpref/prefapi.*, modules/libpref/prefread.*,
+ modules/libpref/test/unit/data/testPrefSticky*.js,
+ modules/libpref/test/unit/test_stickyprefs.js,
+ modules/libpref/test/unit/xpcshell.ini: support 'sticky' preferences,
+ meaning a user value is retained even when it matches the default.
+ bz#1098343.
+ * browser/app/profile/firefox.js, browser/base/content/newtab/intro.js,
+ browser/base/content/newtab/page.js,
+ browser/modules/DirectoryLinksProvider.jsm: Update patch from bz#1094324
+ to fit what landed upstream in newer versions.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 03 Jul 2015 08:57:25 +0900
+
+iceweasel (38.0.1-5) unstable; urgency=medium
+
+ * debian/rules: Force a timezone when extracting defaults/* files from
+ omni.ja archives.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 27 May 2015 07:36:04 +0900
+
+iceweasel (38.0.1-4) unstable; urgency=medium
+
+ * python/mozbuild/mozpack/files.py: Fixup to keep file type.
+ * toolkit/content/Makefile.in, toolkit/content/buildconfig.html: Remove build
+ machine name from about:buildconfig. bz#1168316.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 26 May 2015 21:39:38 +0900
+
+iceweasel (38.0.1-3) unstable; urgency=medium
+
+ * debian/upstream.mk: Force a timezone when setting MOZ_BUILD_DATE.
+
+ * python/mozbuild/mozpack/files.py: Normalize file mode in jars.
+ bz#1168231.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 26 May 2015 08:13:55 +0900
+
+iceweasel (38.0.1-2) unstable; urgency=medium
+
+ * debian/upstream.mk: Set MOZ_BUILD_DATE to the date of the last
+ debian/changelog entry for non-Aurora builds.
+ * debian/branding/content/Makefile.in: Add a dummy conversion for about.png
+ to remove timestamps.
+ * debian/browser.js.in: Default to classic view for about:newtab.
+ * debian/copyright: Update copyright file to some degree.
+ * debian/control*: Bump Standards-Version to 3.9.6.0.
+ - debian/rules: Add build-arch and build-indep targets to debian/rules.
+ * debian/control*: Switch Vcs-* urls to anonscm.debian.org.
+
+ * ipc/testshell/XPCShellEnvironment.cpp, js/src/shell/js.cpp,
+ js/xpconnect/src/XPCShellImpl.cpp: Remove build() function from js and
+ xpc shells. bz#1166243.
+ * toolkit/locales/l10n.mk. Use dozip.py for langpacks. bz#1166538.
+ * browser/app/profile/firefox.js, browser/base/content/newtab/intro.js
+ browser/modules/DirectoryLinksProvider.jsm: Set browser.newtabpage.enhanced
+ default in prefs. bz#1094324.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 25 May 2015 13:25:40 +0900
+
+iceweasel (38.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/vendor.js.in: Disable auto-installing webide related addons.
+ Closes: #785595.
+ * debian/rules: Disable jit on mips. Only mipsel is supported by the jit
+ code currently.
+
+ * configure.in, media/libjpeg/moz.build: Fixup libjpeg-turbo assembly
+ cleanup.
+ * security/manager/ssl/src/SSLServerCertVerification.cpp: Add a NULL-check
+ for extensions on the end entity certificate when gathering EKU telemetry.
+ Closes: #782772.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 19 May 2015 13:56:45 +0900
+
+iceweasel (38.0-2) unstable; urgency=medium
+
+ * debian/repack.py: Fix to support filter patterns excluding a top-level
+ directory.
+
+ * configure.in: Cleanup how libjpeg-turbo assembly build variables are set.
+ bz#1165654. This should fix FTBFSes on arm64 and mips*.
+ * memory/mozjemalloc/jemalloc.c: Make powerpc not use static page sizes.
+ Closes: #763900.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 17 May 2015 10:48:06 +0900
+
+iceweasel (38.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{46,48-51,53-56}, also know as:
+ CVE-2015-2708, CVE-2015-2709, CVE-2015-2710, CVE-2015-2711,
+ CVE-2015-2712, CVE-2015-2713, CVE-2015-2715, CVE-2015-2716,
+ CVE-2015-2717, CVE-2015-2718.
+
+ * debian/branding/Makefile.in, debian/branding/moz.build: Adapt build rules
+ to upstream changes
+ * debian/branding/locales/en-US/brand.*: Add brandShorterName to Iceweasel
+ branding.
+ * debian/branding/content/Makefile.in: Add silhouette-40.svg from the
+ unofficial branding to iceweasel branding
+ * debian/control*: Bump nss and sqlite build dependencies.
+ * debian/control.in, debian/upstream.mk: Change backport rules.
+ - Set LESS_SYSTEM_LIBS on wheezy and jessie.
+ - Only use gstreamer 0.10 on wheezy.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 13 May 2015 09:59:33 +0900
+
+iceweasel (37.0.2-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fix for mfsa2015-45, also known as CVE-2015-2706.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 21 Apr 2015 07:44:32 +0900
+
+iceweasel (37.0.1-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fix for mfsa2015-44, also known as CVE-2015-0799.
+
+ * debian/browser.js.in: Change the pref used to disable openh264.
+ Closes: #769716.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 04 Apr 2015 10:29:21 +0900
+
+iceweasel (37.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{30-34,36-40,42}, also known as:
+ CVE-2015-0815, CVE-2015-0814, CVE-2015-0813, CVE-2015-0812,
+ CVE-2015-0816, CVE-2015-0811, CVE-2015-0808, CVE-2015-0807,
+ CVE-2015-0805, CVE-2015-0806, CVE-2015-0803, CVE-2015-0804,
+ CVE-2015-0801, CVE-2015-0802.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 01 Apr 2015 08:47:45 +0900
+
+iceweasel (36.0.4-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{28-29}, also known as:
+ CVE-2015-0818, CVE-2015-0817.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 22 Mar 2015 10:30:14 +0900
+
+iceweasel (36.0.1-2) experimental; urgency=medium
+
+ * debian/browser.mozconfig.in: Don't build with --disable-eme, reverting the
+ change from 36.0-1.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 09 Mar 2015 11:04:37 +0900
+
+iceweasel (36.0.1-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ * gfx/layers/basic/BasicCompositor.cpp,
+ gfx/layers/basic/BasicLayerManager.cpp: Reintroduce pixman code path
+ removed in bz#1097776 for --disable-skia builds. bz#1136958.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 09 Mar 2015 08:45:03 +0900
+
+iceweasel (36.0-2) experimental; urgency=medium
+
+ * debian/browser.mozconfig.in: Force enable skia, to possibly fix FTBFS
+ on non-x86/amd64/arm architectures.
+
+ * gfx/skia/moz.build: Remove duplicate SkDiscardableMemory_none.cpp.
+ bz#1136958.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 26 Feb 2015 18:12:45 +0900
+
+iceweasel (36.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{11,13-17,19-27}, also known as:
+ CVE-2015-0836, CVE-2015-0835, CVE-2015-0832, CVE-2015-0830,
+ CVE-2015-0834, CVE-2015-0831, CVE-2015-0829, CVE-2015-0827,
+ CVE-2015-0826, CVE-2015-0825, CVE-2015-0824, CVE-2015-0823,
+ CVE-2015-0822, CVE-2015-0821, CVE-2015-0819, CVE-2015-0820.
+
+ * debian/control*: Bump nss and sqlite build dependencies.
+ * debian/branding/Makefile.in, debian/branding/moz.build,
+ debian/extra-stuff/Makefile.in, debian/extra-stuff/moz.build: Update and
+ cleanup.
+ * debian/browser.install.in: Remove mozilla-xremote-client, it was removed
+ upstream.
+ * debian/browser.install.in, debian/rules: Remove libmozsandbox.so, it's
+ not a shared library anymore.
+ * debian/browser.mozconfig.in: Build with --disable-eme for now,
+
+ -- Mike Hommey <glandium@debian.org> Wed, 25 Feb 2015 16:16:40 +0900
+
+iceweasel (35.0.1-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ * debian/browser.install.in, debian/rules: Only install libmozsandbox.so on
+ i386 and amd64.
+ * debian/control: Recommend gstreamer packages for video playing capabilities.
+ Closes: #737092. Also change the gstreamer build dependencies not to use
+ alternatives.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 30 Jan 2015 10:31:28 +0900
+
+iceweasel (35.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2015-{01-06,08-09}, also known as:
+ CVE-2014-8634, CVE-2014-8635, CVE-2014-8637, CVE-2014-8637,
+ CVE-2014-8639, CVE-2014-8640, CVE-2014-8641, CVE-2014-8642,
+ CVE-2014-8636.
+
+ * debian/browser.mozconfig.in: Build with --enable-pie instead of our own
+ patch to the build system.
+
+ * moz.build: Fix how debian/extra-stuff is added to upstream build system
+ directory traversal after upstream changes.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 14 Jan 2015 11:46:37 +0900
+
+iceweasel (34.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2014-{83-89,91}, also known as:
+ CVE-2014-1587, CVE-2014-1588, CVE-2014-1589, CVE-2014-1590,
+ CVE-2014-1591, CVE-2014-1592, CVE-2014-1593, CVE-2014-1594,
+ CVE-2014-8631, CVE-2014-8632.
+
+ * debian/branding/firefox-branding.js: Set browser.aboutHomeSnippets.updateUrl
+ to "data:text/html,", which resets previously downloaded snippets after a
+ day.
+ * debian/browser.js.in: Avoid openh264 being downloaded and disable it if it
+ is already there. Closes: #769716.
+ * debian/control*: Bump nss and sqlite build dependencies.
+ * debian/rules: Remove --disable-compile-environment for l10n builds because
+ of bz#1063880.
+ * debian/browser.install.in: Add sandbox library.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 03 Dec 2014 01:11:24 -0800
+
+iceweasel (33.1-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ * debian/changelog: Add missing entries for 27.0.1-1.
+ * debian/rules: Don't force to build with GCC 4.9 on armhf anymore.
+ * debian/browser.mozconfig.in: Don't build with --enable-unified-compilation.
+ It may be causing build problems on architectures with limited resources.
+ * debian/browser.install.in, debian/browser.postinst.in,
+ debian/browser.postrm.in, debian/browser.preinst.in, debian/duckduckgo.xml:
+ Remove duckduckgo search engine, since upstream now has it included.
+ * debian/branding/firefox-branding.js:
+ - Set browser.startup.homepage_override.mstone to "ignore".
+ - Set browser.aboutHomeSnippets.updateUrl to nothing. Closes: #721689.
+
+ * Import patches from the nss source package that are relevant to building
+ iceweasel against the in-tree nss source, for backports:
+ - security/nss/lib/freebl/unix_rand.c,
+ security/nss/cmd/shlibsign/shlibsign.c: Fix FTBFS on Hurd because of
+ MAXPATHLEN
+ - security/nss/coreconf/Linux.mk,
+ security/nss/coreconf/arch.mk, security/nss/coreconf/config.mk,
+ security/nss/lib/freebl/unix_rand.c, security/nss/lib/softoken/softoken.h,
+ security/nss/lib/ssl/sslmutex.*: GNU/kFreeBSD support.
+ - security/nss/lib/ckfw/builtins/certdata.txt: Adds the SPI Inc. and
+ CAcert.org CA certificates.
+ Those patches were applied on the esr24 branch, but were forgotten on the
+ release branch at the time.
+ * media/libcubeb/tests/moz.build: Work around binutils assertion on mips.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 11 Nov 2014 12:08:34 +0900
+
+iceweasel (33.0-2) experimental; urgency=medium
+
+ * debian/control*, debian/rules: Do not build depend on gstreamer 1.0 when
+ building a backport.
+
+ * netwerk/base/public/security-prefs.js,
+ security/manager/ssl/src/nsNSSComponent.cpp: Disable SSLv3 to address
+ CVE-2014-3566. bz#1076983.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 18 Oct 2014 10:45:27 +0900
+
+iceweasel (33.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2014-{74-76,78-82}, also known as:
+ CVE-2014-1574, CVE-2014-1575, CVE-2014-1576, CVE-2014-1577,
+ CVE-2014-1580, CVE-2014-1581, CVE-2014-1582, CVE-2014-1584,
+ CVE-2014-1585, CVE-2014-1586, CVE-2014-1583.
+
+ * debian/control*: Bump nss and sqlite build dependencies.
+ * debian/browser.install.in, debian/control.in, debian/rules,
+ debian/upstream.mk, debian/vendor.js.in: Change how official branding is
+ handled.
+ * debian/rules: Disable tests on stable-security.
+ * debian/browser.install.in, debian/browser.mozconfig.in, debian/control.in,
+ debian/rules: Allow to build against Gtk+3 by setting the GTK3 environment
+ variable while building.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 15 Oct 2014 09:40:22 +0900
+
+iceweasel (32.0.3-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ * toolkit/components/search/nsSearchService.js: Bump search engine max icon
+ size to 35kB. Closes: #749084.
+ * build/autoconf/compiler-opts.m4, config/rules.mk: Build target programs as
+ position independent executable when supported by gcc/clang. bz#857628.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 25 Sep 2014 15:27:37 +0900
+
+iceweasel (32.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2014-{67-70,72}, also known as:
+ CVE-2014-1562, CVE-2014-1553, CVE-2014-1554, CVE-2014-1563,
+ CVE-2014-1564, CVE-2014-1565, CVE-2014-1567.
+
+ * debian/browser.bug-script.in, debian/browser.install.in,
+ debian/extra-stuff/Makefile.in, debian/extra-stuff/reportbug-helper-script,
+ debian/installer/package-manifest.browser: Fix bug script.
+ * debian/browser.install.in, debian/rules, debian/upstream.mk: Install
+ libreplace_malloc.so when building a nightly.
+ * debian/control*: Bump nss and sqlite build dependencies.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 03 Sep 2014 15:08:17 +0900
+
+iceweasel (31.0-3) unstable; urgency=high
+
+ * The "this time it's going to build on armel" release.
+
+ * debian/rules, debian/control*: Update configure with autoconf2.13 every
+ time.
+
+ * configure.in: Use integers for audio when on Android, or when using ARM
+ on other OSes, and disable webm encoding. bz#1047791.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 03 Aug 2014 09:52:28 +0900
+
+iceweasel (31.0-2) unstable; urgency=high
+
+ * Urgency set to high to have a faster transition after armel FTBFS is
+ fixed (which is the only thing that prevented the transition).
+ * debian/control*: Remove forced gcc-4.9 build dependency for armhf.
+
+ * media/libopus/moz.build: Disable some libopus ARM features on < ARMv6.
+ bz#1025689.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 02 Aug 2014 09:28:53 +0900
+
+iceweasel (31.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Fixes crashes in WbGL when building with GCC 4.9. Closes: #751569.
+ * Fixes for mfsa2014-{56-58,60-62,64-66}, also known as:
+ CVE-2014-1547, CVE-2014-1548, CVE-2014-1549, CVE-2014-1550,
+ CVE-2014-1561, CVE-2014-1555, CVE-2014-1556, CVE-2014-1557,
+ CVE-2014-1558, CVE-2014-1559, CVE-2014-1560, CVE-2014-1552.
+
+ * debian/browser.lintian-overrides.in: Add lintian override for embedded
+ srtp.
+ * debian/browser.NEWS.in: Add a NEWS file to note the deprecation of
+ NTLMv1 authentication.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 23 Jul 2014 08:00:15 +0900
+
+iceweasel (30.0-2) unstable; urgency=medium
+
+ * debian/browser-dev.install.in, debian/control*, debian/libxul.pc.in,
+ debian/mozilla-nspr.pc.in, debian/mozilla-plugin.pc.in, debian/rules:
+ Add a few pkg-config files to the iceweasel-dev package. Closes: #751268.
+
+ * gfx/skia/trunk/src/opts/SkBlitRow_opts_arm.cpp: Re-apply patch from
+ bz#901208 that upstream dropped when updating skia.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 14 Jun 2014 09:30:39 +0900
+
+iceweasel (30.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2014-{48-49,51-54}, almost known as:
+ CVE-2014-1533, CVE-2014-1534, CVE-2014-1536, CVE-2014-1537,
+ CVE-2014-1538, CVE-2014-1540, CVE-2014-1541, CVE-2014-1542,
+ CVE-2014-1543.
+
+ * debian/control*: Bump sqlite3 and nspr build dependencies.
+ * debian/rules: Don't check autoconf.mk and emptyvars.mk in js/src/config,
+ that's not used anymore.
+ * debian/browser-dev.install.in, debian/browser-dev.links.in,
+ debian/browser.install.in, debian/browser.links.in,
+ debian/browser.lintian-overrides.in, debian/browser.mozconfig.in
+ debian/control*, debian/extra-stuff/Makefile.in,
+ debian/installer/package-manifest.browser, debian/noinstall.in,
+ debian/rules, debian/test.mk: Stop building xulrunner packages.
+ * debian/installer/package-manifest.xulrunner, debian/dh/*,
+ debian/xulrunner*: Removed.
+ * debian/browser.lintian-overrides.in: Add lintian override for embedded
+ libpng with APNG support.
+ * debian/rules: Make xpcshell executable in the SDK.
+ * debian/copyright: Point to /usr/share/common-licenses/Apache-2.0 instead
+ of including the whole license. Also fix a couple typos.
+
+ * browser/components/migration/content/migration.js,
+ browser/components/migration/content/migration.xul,
+ browser/components/migration/src/BrowserProfileMigrators.manifest,
+ browser/components/migration/src/FirefoxProfileMigrator.js,
+ browser/components/migration/src/MigrationUtils.jsm,
+ browser/components/migration/src/ProfileMigrator.js,
+ browser/locales/en-US/chrome/browser/migration/migration.dtd,
+ browser/locales/en-US/chrome/browser/migration/migration.properties,
+ l10n-*/browser/chrome/browser/migration/migration.properties,
+ toolkit/content/resetProfile.js, toolkit/modules/ResetProfile.jsm,
+ toolkit/profile/nsIProfileMigrator.idl, toolkit/xre/nsAppRunner.cpp:
+ Revert previous "Reset Firefox" changes.
+ * toolkit/modules/ResetProfile.jsm, toolkit/xre/nsAppRunner.cpp: Use
+ "firefox" instead of MOZ_APP_NAME for profile reset.
+ * xulrunner/moz.build, xulrunner/installer/*.pc.in, xulrunner/confvars.sh,
+ xulrunner/app/xulrunner.js, netwerk/test/unit/test_socks.js,
+ webapprt/gtk2/webapprt.cpp, configure.in,
+ xpcom/glue/standalone/nsXPCOMGlue.cpp: Revert changes that are
+ irrelevant now that Iceweasel is not a xulrunner application.
+ * browser/app/profile/firefox.js, browser/locales/en-US/firefox-l10n.js:
+ Revert changes to general.useragent.locale. They are actually not required.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 07 Jun 2014 10:27:46 +0900
+
+iceweasel (29.0.1-2) unstable; urgency=medium
+
+ * debian/rules:
+ - Don't pull MOZ_UA_BUILDID from official branding, it's not there anymore
+ and not useful anyways since bz#728773.
+ - Properly create all stamp files.
+ * debian/control*: xulrunner-dev conflicts with libmozjs-dev. Closes: #747761
+ * debian/rules, debian/control*: Use GCC 4.9 on armhf to work around bug
+ #748422.
+
+ * js/xpconnect/src/XPCWrappedJSClass.cpp,
+ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_*.cpp,
+ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_*.cpp: Fixup ppc and
+ sparc xpconnect
+
+ -- Mike Hommey <glandium@debian.org> Sat, 24 May 2014 08:11:59 +0900
+
+iceweasel (29.0.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/control*, debian/rules: Don't separate out the libdbusservice
+ component for dh_shlibdeps. libxul.so has had the same dependencies for
+ a while anyways.
+ * debian/rules: Replace occurrences of /usr/lib/$($(PRODUCT)) with
+ $(LIB_DIR).
+ * debian/xulrunner-dev.links.in: Install nspr-config in the sdk, not the
+ application directory. Also don't install it when building with bundled
+ nspr.
+ * debian/browser.mozconfig*, debian/rules: Move --with-system-nspr/nss flags
+ to browser.mozconfig.
+ * debian/rules: Use browser.mozconfig to build l10n.
+ * debian/control*, debian/rules, debian/xulrunner.mozconfig.in: Build against
+ gstreamer 1.0 when possible.
+
+ * js/src/jit/BaselineIC.cpp, js/src/jit/arm/MacroAssembler-arm.cpp,
+ js/src/jit/arm/MacroAssembler-arm.h: Fix mis-refactoring, and add some
+ asserts to let debug users know that float32 can be broken. bz#957504.
+ * Pass JSVAL as a pointer to the structure on ppc. bz#961488.
+ * configure.in, content/media/gstreamer/GStreamerAllocator.*,
+ content/media/gstreamer/GStreamerFormatHelper.cpp,
+ content/media/gstreamer/GStreamerFunctionList.h,
+ content/media/gstreamer/GStreamerLoader.*,
+ content/media/gstreamer/GStreamerReader*,
+ content/media/gstreamer/moz.build, content/media/test/manifest.js: Add
+ support for GStreamer 1.0. bz#806917.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 11 May 2014 15:53:14 +0900
+
+iceweasel (29.0-2) experimental; urgency=medium
+
+ * debian/rules: Don't use find to get the list of autoconf.mk and
+ emptyvars.mk files. This should fix the FTBFSes on i386 and armhf.
+ * debian/branding/content/Makefile.in, debian/branding/content/jar.mn,
+ debian/branding/locales/Makefile.in, debian/branding/locales/jar.mn:
+ Add missing icons to branding. Closes: #747049.
+ * debian/browser.links.in: Remove dangling /usr/lib/iceweasel/browser/modules.
+ Closes: #746529.
+
+ * gfx/src/nsDeviceContext.cpp: Backout bz#991767 for causing bz#1003707.
+ Closes: #746598.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 07 May 2014 10:30:20 +0900
+
+iceweasel (29.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2014-{34,36-39,41-44,46-47}, almost known as:
+ CVE-2014-1518, CVE-2014-1519, CVE-2014-1522, CVE-2014-1523,
+ CVE-2014-1525, CVE-2014-1528, CVE-2014-1529, CVE-2014-1530,
+ CVE-2014-1531, CVE-2014-1532, CVE-2014-1526.
+
+ * debian/control*: Bump nspr and sqlite3 build dependencies.
+ * debian/rules: Adjust AUTOCONF_DIRS.
+ * debian/branding/moz.build, debian/branding/content/moz.build,
+ debian/branding/locales/moz.build: Add now necessary definition for jar.mn.
+ * debian/branding/configure.sh: Set MOZ_APP_NAME.
+ * debian/browser.install.in, debian/browser.mozconfig, debian/rules:
+ Use omnijar chrome format for browser.
+ * debian/control*: Build depend on iso-codes.
+
+ * config/makefiles/target_binaries.mk, config/rules.mk, js/src/Makefile.in:
+ Revert changes to add sonames, since the last library this was used for
+ is mozjs, and it was removed in 28.0-1.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 28 Apr 2014 23:21:57 -0700
+
+iceweasel (28.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2014-{15,17-20,22-23,26-32}, also known as
+ CVE-2014-1493, CVE-2014-1494, CVE-2014-1497, CVE-2014-1498,
+ CVE-2014-1499, CVE-2014-1500, CVE-2014-1502, CVE-2014-1504,
+ CVE-2014-1508, CVE-2014-1509, CVE-2014-1505, CVE-2014-1510,
+ CVE-2014-1511, CVE-2014-1512, CVE-2014-1513, CVE-2014-1514.
+
+ * debian/branding/content/Makefile.in, debian/branding/content/jar.mn,
+ debian/branding/content/wordmark.xsl: Adapt Iceweasel branding to upstream
+ changes. Closes: #739797.
+ * debian/extra-stuff/Makefile.in, debian/installer/Makefile.in,
+ debian/rules: Fix various places to use the new location of the upstream
+ preprocessor.
+ * debian/control*:
+ - Bump nspr, sqlite and vpx build dependencies.
+ - Add build dependency on libpulse-dev.
+ * debian/branding/content/Makefile.in: Fix iceweasel branding build after
+ bz#934361.
+ * moz.build, debian/rules, debian/extra-stuff/moz.build: Add
+ debian/extra-stuff to upstream build system directory traversal.
+ * moz.build: Make upstream build system create debian/installer/Makefile.
+ * debian/rules: Remove rules to create Makefiles, they don't work anymore.
+ * debian/rules: Fix dh_xulrunner npapi check to fit upstream changes.
+ * debian/xulrunner.mozconfig.in, debian/control*: Use in-tree libvpx for
+ backports.
+ * debian/latest_nightly.py: Use ftplib instead of ftputil.
+ * debian/noinstall.in, debian/xulrunner-dev.install.in: Install
+ mozilla-nspr.pc and mozilla-nss.pc when building backports. Closes: #739490.
+ * debian/control*, debian/libmozjs*, debian/noinstall.in, debian/rules,
+ debian/smjs.1, debian/spidermonkey-bin*,
+ debian/xulrunner-GRE_VERSION.links.in, debian/xulrunner-dev.install.in,
+ debian/xulrunner.mozconfig.in: Stop building spidermonkey packages.
+ * debian/xulrunner.mozconfig.in: Enable unified compilation for faster builds,
+ smaller debug info and possibly less memory usage when linking.
+
+ * modules/libpref/src/moz.build, modules/libpref/src/Makefile.in: Fixup
+ MOZ_OFFICIAL_BRANDING use for phishing shavar after upstream build system
+ changes.
+ * xulrunner/installer/mozilla-ns*.pc.in: Fix includedir in mozilla-nspr.pc
+ and mozilla-nss.pc. bz#985200.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 19 Mar 2014 13:18:08 +0900
+
+iceweasel (27.0.1-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ * debian/copyright, debian/rules: Update copyright info. Closes: #735297.
+ * debian/source.filter:
+ - Remove build/pgo/blueprint/valid.png from the source archive.
+ Closes: #736592
+ - Remove minified jquery from source archive. Closes: #736725.
+ * debian/control*: Bump nspr and nss build dependencies.
+ * debian/rules: Work around build failure following the removal of valid.png.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 22 Feb 2014 12:15:46 +0900
+
+iceweasel (27.0-2) experimental; urgency=medium
+
+ * debian/installer/package-manifest.browser: Install files from the right
+ location to fix about:iceweasel.
+ * debian/rules: Add missing branding flag to l10n configure. Closes: #737824.
+
+ * xpcom/base/nsMemoryReporterManager.cpp: Fix FTBFS on kFreeBSD.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 08 Feb 2014 08:24:19 +0900
+
+iceweasel (27.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fixes for mfsa2014-{01-05,07-11,13}, also known as
+ CVE-2014-1477, CVE-2014-1478, CVE-2014-1479, CVE-2014-1480,
+ CVE-2014-1482, CVE-2014-1483, CVE-2014-1485, CVE-2014-1486,
+ CVE-2014-1487, CVE-2014-1489, CVE-2014-1488, CVE-2014-1481.
+
+ * debian/upstream.mk: Only use one digit of the GRE_MILESTONE for
+ GRE_VERSION.
+ * debian/control*: Bump sqlite3 and nss build dependencies.
+ * debian/rules: Use a separate build directory for l10n, without
+ --with-libxul-sdk.
+ * debian/copyright: Updated.
+
+ * config/makefiles/target_libs.mk, js/src/config/makefiles/target_libs.mk:
+ Fixup soname rules for upstream changes.
+ * moz.build, widget/gonk/libdisplay/moz.build, xpcom/ds/moz.build,
+ xpcom/reflect/xptcall/src/md/unix/moz.build: Fix
+ --disable-compile-environment a little. bz#862770.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 05 Feb 2014 20:06:49 +0900
+
+iceweasel (26.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{104-116}, also known as
+ CVE-2013-5609, CVE-2013-5610, CVE-2013-5611, CVE-2013-5612,
+ CVE-2013-5614, CVE-2013-5616, CVE-2013-5618, CVE-2013-5619,
+ CVE-2013-6671, CVE-2013-6672, CVE-2013-6673, CVE-2013-5613,
+ CVE-2013-5615, CVE-2013-6629, CVE-2013-6630.
+
+ * debian/*.mozconfig: Add --enable-release configure flag.
+ * debian/control*: Bump nspr build dependency.
+ * debian/*.mozconfig: Don't build --with-system-ply, the option is gone.
+ * debian/noinstall.in: Don't install usr/lib/xulrunner-devel-*/sdk/bin/ply.
+ * debian/control*, debian/noinstall.in, debian/rules, debian/upstream.mk,
+ debian/xulrunner-GRE_VERSION.install.in, debian/xulrunner.mozconfig:
+ Don't build against system nspr, nss and sqlite3 when building backports.
+ * debian/control*, debian/xulrunner.mozconfig.in: Build with the in-tree
+ cairo. I think it's time to admit that there are too many issues with
+ system cairo.
+ * debian/rules: Ensure debian/control is updated when running debian/rules
+ clean.
+
+ * toolkit/content/resetProfile.js, toolkit/modules/ResetProfile.jsm:
+ Fixup "Reset Firefox" after bad merge.
+ * configure*: Fixup NSPR_CFLAGS when building with libxul-sdk and in-tree
+ nspr.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 15 Dec 2013 16:45:37 +0900
+
+iceweasel (25.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{93-102}, also known as
+ CVE-2013-5590, CVE-2013-5591, CVE-2013-5592, CVE-2013-5593,
+ CVE-2013-5604, CVE-2013-5595, CVE-2013-5596, CVE-2013-5597,
+ CVE-2013-5598, CVE-2013-5599, CVE-2013-5600, CVE-2013-5601,
+ CVE-2013-5602, CVE-2013-5603.
+
+ * debian/rules: Don't try to disable methodjit, since it's long gone.
+ * debian/upstream.mk: Adjust version mangling to handle the version scheme
+ change without changing package names.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 02 Nov 2013 10:38:15 +0900
+
+iceweasel (24.0-2) unstable; urgency=low
+
+ * debian/control*: Build-depend on fonts-freefont-ttf instead of
+ fonts-freefont, which doesn't exist. Closes: #714056. Interestingly,
+ experimental was happy with that, but unstable isn't.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 19 Sep 2013 07:03:08 +0900
+
+iceweasel (24.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{76-82,85,88-92}, also known as
+ CVE-2013-1718, CVE-2013-1719, CVE-2013-1720, CVE-2013-1721,
+ CVE-2013-1722, CVE-2013-1723, CVE-2013-1724, CVE-2013-1725,
+ CVE-2013-1728, CVE-2013-1730, CVE-2013-1732, CVE-2013-1735,
+ CVE-2013-1736, CVE-2013-1737, CVE-2013-1738.
+
+ * debian/control*:
+ - Bump sqlite build dependency.
+ - Add build dependencies on gstreamer. Closes: #682917.
+ - Build depend on fonts-freefont and fonts-dejima-mincho. Closes: #714056.
+ - Use strict dependencies between binary packages. Closes: #720467.
+ - Add Suggests for MathML-friendly fonts. Closes: #697277.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 18 Sep 2013 09:10:25 +0900
+
+iceweasel (23.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules:
+ - Don't use --no-keep-memory on ia64. Somehow, it makes ld fail to relax
+ some relocations.
+ - Don't use --as-needed on ia64. Somehow, it makes ld crash on some files.
+
+ * ipc/chromium/chromium-config.mk: Add missing piece of the upstream patch
+ for bz#901414. Fixes FTBFS on kFreeBSD.
+ * js/public/Value.h: Remove uintptr_t word payload union member on 64BE, it
+ grows jsval_layout size and is unused. bz#618485. Fixes FTBFS on s390x.
+ * gfx/skia/src/opts/SkBlitRow_opts_arm.cpp: Fixups landed upstream. Fixes
+ FTBFS on armel.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 21 Aug 2013 22:07:49 +0900
+
+iceweasel (23.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{63-65,67-70,72-73,75}, also known as
+ CVE-2013-1701, CVE-2013-1702, CVE-2013-1704, CVE-2013-1705,
+ CVE-2013-1708, CVE-2013-1709, CVE-2013-1710, CVE-2013-1711,
+ CVE-2013-1713, CVE-2013-1714, CVE-2013-1717.
+
+ * debian/control*: Bump nss build dependency.
+ * debian/rules:
+ - Avoid installing libmozjs.a.
+ - Install mozjs.pc as mozilla-js.pc.
+ - Reduce memory usage of the linker at the expense of processing time.
+ This should help on lower-end architectures like arm and mips, which
+ spend an immense amount of time swapping.
+ * debian/dh/dh_xulrunner.in: Change one of the searched strings to detect
+ the xulrunner stub. This avoids an error in detection when gcc inlines
+ strings in the code for strcpy.
+
+ * build/unix/elfhack/elfhack.cpp: Support R_ARM_JUMP24 and R_ARM_CALL
+ relocations. bz#892366. Fixes FTBFS on armel.
+ * build/unix/elfhack/elfhack.cpp, build/unix/elfhack/inject.c: Turn BL into
+ BLX when doing thumb call relocations and the target is ARM. bz#898998.
+ Fixes FTBFS on armhf.
+ * xpcom/glue/nsIClassInfoImpl.h: Properly align statically allocated
+ classinfo objects. bz#898916. Fixes FTBFS on armel.
+ * js/public/HeapAPI.h, js/src/gc/Memory.*, js/src/gc/Nursery.cpp,
+ js/src/ion/AsmJS.*, js/src/ion/AsmJSModule.h, js/src/jsapi.cpp,
+ js/src/jscntxt.h, js/src/jsgc.cpp, js/src/jstypedarray.cpp: Use the
+ runtime page size to control arena decommit. bz#840242. Fixes FTBFS on
+ sparc and runtime issues on mips and likely other architectures.
+ * js/src/configure*: Disable Yarr JIT on sparc and mips. bz#900821.
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_*: Change SharedStub
+ definition in tier-3 xptcstubs to better fit reality and make the compiler
+ happy now that nsresult is an enum. bz#901200.
+ * configure*: Set WEBRTC_TARGET_ARCH to a right value on ia64. bz#901202.
+ * gfx/skia/src/opts/SkBlitRow_opts_arm.cpp: Fix Skia for ARM v4t. bz#901208.
+ * js/src/ion/AsmJSSignalHandlers.cpp: Support GNU/kFreeBSD.
+ * ipc/chromium/Makefile.in, ipc/chromium/chromium-config.mk,
+ ipc/chromium/src/base/dir_reader_posix.h,
+ ipc/chromium/src/base/platform_thread.h,
+ ipc/chromium/src/base/platform_thread_posix.cc,
+ ipc/chromium/src/base/process_util.h,
+ ipc/chromium/src/build/build_config.h: Fix ipc/chromium to build for
+ GNU/kFreeBSD. bz#901414.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 07 Aug 2013 08:25:28 +0900
+
+iceweasel (22.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{49-62}, also known as
+ CVE-2013-1682, CVE-2013-1684, CVE-2013-1685, CVE-2013-1686,
+ CVE-2013-1687, CVE-2013-1688, CVE-2013-1690, CVE-2013-1692,
+ CVE-2013-1693, CVE-2013-1694, CVE-2013-1695, CVE-2013-1696,
+ CVE-2013-1697, CVE-2013-1698, CVE-2013-1699, CVE-2013-1700.
+
+ * debian/rules:
+ - Fix configure-check-xulrunner with gawk. Closes: #708765.
+ - Work around moz.build limitations for l10n.
+ - Work around the variable override limitation for MODULE.
+ - gc and ds include subdirectories have been removed.
+ - Disable branding check for now.
+ * debian/control*: Bump sqlite build dependency.
+ * debian/*/Makefile.in, debian/branding/**/moz.build:
+ Accomodate our extra Makefiles to upstream build system changes.
+ * debian/xulrunner-GRE_VERSION.install.in: libxpcom was removed.
+ * debian/rules, debian/check_resources.*: Remove resource:// url
+ checker, now that resource://app and resource://gre are different
+ upstream, too.
+
+ * memory/mozjemalloc/jemalloc.c: Don't hardcode page size on mips.
+ Should fix FTBFS on mips.
+ * js/src/vm/Stack.cpp: Fix FTBFS on non-Linux glibc systems due to mincore
+ prototype discrepancy. Thanks Samuel Thibault. Closes: #697891.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 26 Jun 2013 08:43:55 +0900
+
+iceweasel (21.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{41-43,46-48}, also known as
+ CVE-2013-0801, CVE-2013-1669, CVE-2013-1670, CVE-2013-1671,
+ CVE-2013-1674, CVE-2013-1675, CVE-2013-1676, CVE-2013-1677,
+ CVE-2013-1679, CVE-2013-1680, CVE-2013-1681.
+
+ * debian/control*:
+ - Add Breaks: xul-ext-torbutton. Closes: #690729.
+ - Build depend on python 2.7 and python-minimal >= 2.6.6-13~.
+ - Bump nspr build dependencies.
+ * debian/rules:
+ - Use config.status directly to generate Makefiles.
+ - Adjust --{with,enable}-system options check to upstream build system
+ changes (in advance).
+ * debian/browser.install.in, debian/browser.links.in,
+ debian/check_resources.overrides,
+ debian/installer/package-manifest.xulrunner, debian/noinstall.in,
+ debian/rules, debian/branding/defs.mk: Browser parts moved in a
+ subdirectory.
+ * debian/check_resources.overrides: Add new overrides for providermanager.jsm.
+ * debian/xulrunner-GRE_VERSION.links.in: Use the full libmozjs soname for the
+ symlink in the xulrunner directory.
+
+ * browser/confvars.sh: Disable Firefox Health Report.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 15 May 2013 12:40:11 +0200
+
+iceweasel (20.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{30,35-39}, also known as
+ CVE-2013-0788, CVE-2013-0789, CVE-2013-0796, CVE-2013-0795,
+ CVE-2013-0794, CVE-2013-0793, CVE-2013-0792.
+
+ * debian/browser.mozconfig: Disable DASH when building browser part.
+ * debian/check_resources.overrides: Add override for gcli.jsm.
+ * debian/rules: Test plugins have moved from dist/bin/plugins to
+ dist/plugins.
+ * debian/control.*: Bump nss and sqlite3 build dependencies.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 02 Apr 2013 21:13:56 +0200
+
+iceweasel (19.0.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fix for mfsa2013-29, also known as CVE-2013-0787.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 08 Mar 2013 22:29:04 +0100
+
+iceweasel (19.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{21-28}, also known as
+ CVE-2013-0783, CVE-2013-0784, CVE-2013-0772, CVE-2013-0765,
+ CVE-2013-0773, CVE-2013-0774, CVE-2013-0775, CVE-2013-0776,
+ CVE-2013-0780, CVE-2013-0782, CVE-2013-0777, CVE-2013-0778,
+ CVE-2013-0779, CVE-2013-0781.
+
+ * debian/control*: Bump nspr build dependency and add missing epoch to nspr
+ and nss build dependencies. Closes: #698961.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 20 Feb 2013 09:22:52 +0100
+
+iceweasel (18.0.2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 08 Feb 2013 16:03:33 +0100
+
+iceweasel (18.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+ - Fixes handling of language packs. Closes: #697836.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 18 Jan 2013 22:39:42 +0100
+
+iceweasel (18.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2013-{01-19}, also known as
+ CVE-2013-0769, CVE-2013-0749, CVE-2013-0770, CVE-2013-0760,
+ CVE-2013-0762, CVE-2013-0766, CVE-2013-0767, CVE-2013-0761,
+ CVE-2013-0763, CVE-2013-0771, CVE-2012-5829, CVE-2013-0768,
+ CVE-2012-0759, CVE-2013-0744, CVE-2013-0751, CVE-2013-0764,
+ CVE-2013-0745, CVE-2013-0746, CVE-2013-0747, CVE-2013-0748,
+ CVE-2013-0750, CVE-2013-0752, CVE-2013-0757, CVE-2013-0758,
+ CVE-2013-0753, CVE-2013-0754, CVE-2013-0755, CVE-2013-0756.
+
+ * debian/control*: Bump nspr, nss and sqlite build dependencies.
+ * debian/control*, debian/xulrunner.mozconfig: Build against embedded
+ libjpeg-turbo and build depend on yasm accordingly.
+ * debian/xulrunner-GRE_VERSION.lintian-overrides.in: Add a lintian override
+ for libjpeg-turbo.
+ * debian/check_resources.overrides: Add an override for SettingsDB.jsm.
+
+ * services/*, testing/marionette/*: Fix services import urls. bz#815320.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 09 Jan 2013 08:56:15 +0100
+
+iceweasel (17.0.1-2) experimental; urgency=low
+
+ * debian/iceweasel-runner, debian/iceweasel.bug-presubj,
+ debian/iceweasel.install, debian/iceweasel.links.in, debian/noinstall.in,
+ debian/rules: Use the iceweasel binary instead of the xulrunner stub, and
+ remove the shell wrapper
+ * debian/control*: Remove xulrunner dependency on libnspr4-0d.
+ Closes: #695346.
+ * debian/iceweasel-xremote-client, debian/iceweasel.install, debian/rules:
+ Remove iceweasel-xremote-client.
+ * debian/noinstall.in, debian/rules: Don't remove update-settings.ini and
+ move firefox-l10n.js removal to debian/noinstall.in.
+ * debian/rules: Cleanup *.pyc removal, and remove *.pyo as well.
+ * debian/iceweasel.1: Update manpage.
+ * debian/noinstall.in: Remove usr/lib/xulrunner-@GRE_VERSION@/libmozjs.so
+ with noinstall.in, it's symlinked later on.
+ * debian/test.mk: Use the iceweasel binary for tests.
+ * debian/branding/Makefile.in, debian/iceweasel.install, debian/rules:
+ Don't generate mozicon*.xpm or firefox.ico, and generate iceweasel.xpm from
+ debian/rules.
+ * debian/*: Allow to build with the firefox branding.
+ * debian/browser.README.Debian.in: Update the text about the application not
+ being named Firefox.
+
+ * browser/app/Makefile.in: Move MOZ_OFFICIAL_BRANDING definition to avoid
+ conflict with bz#755724.
+ * browser/app/Makefile.in, browser/app/nsBrowserApp.cpp, configure.in:
+ Don't use the xulrunner stub when building Firefox against a libxul SDK.
+ bz#755724.
+ * toolkit/mozapps/installer/Packager.pm: Dereference symbolic links when
+ packaging. This effectively reverts a part of bz#552864 that ended up not
+ being useful.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 28 Dec 2012 17:56:41 +0100
+
+iceweasel (17.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/upstream.mk: Add a rule to import tarballs in git repository.
+ * debian/repack.py: Don't error out when a repack filter is unused.
+ * debian/iceweasel.desktop: Fix StartupWMClass. Closes: #693714.
+
+ * media/webrtc/shared_libs.mk,
+ media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.c,
+ media/webrtc/trunk/src/typedefs.h: Allow webrtc to build on more
+ architectures (hopefully). Thanks Michel Dänzer for the original patch.
+ bz#814693. Closes: #694071.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 01 Dec 2012 09:58:43 +0100
+
+iceweasel (17.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2012-{91-106}, also known as
+ CVE-2012-5842, CVE-2012-5843, CVE-2012-4202, CVE-2012-4201,
+ CVE-2012-5836, CVE-2012-4203, CVE-2012-4204, CVE-2012-4205,
+ CVE-2012-4206, CVE-2012-4208, CVE-2012-5841, CVE-2012-4207,
+ CVE-2012-5837, CVE-2012-4209, CVE-2012-4210, CVE-2012-4214,
+ CVE-2012-4215, CVE-2012-4216, CVE-2012-5829, CVE-2012-5839,
+ CVE-2012-5840, CVE-2012-4212, CVE-2012-4213, CVE-2012-4217,
+ CVE-2012-4218, CVE-2012-5830, CVE-2012-5833, CVE-2012-5835,
+ CVE-2012-5838.
+
+ * debian/upstream.mk: Get l10n for nightlies.
+ * debian/rules:
+ - Use a more generic command to build Makefiles. This avoids ftbfs
+ because make-makefile is gone.
+ - Modify the dh_xulrunner test to account for the second test plugin.
+ * debian/iceweasel.mozconfig: Disable webrtc during the browser build.
+
+ * browser/locales/jar.mn: Preprocess appstrings.properties. Closes: #688987.
+ * toolkit/mozapps/installer/packager.mk: Avoid installing .mkdir.done and
+ precomplete with make install. bz#798450
+
+ -- Mike Hommey <glandium@debian.org> Tue, 20 Nov 2012 23:54:09 +0100
+
+iceweasel (16.0.2-1) experimental; urgency=high
+
+ * New upstream release.
+ * Fixes for mfsa2012-90, also known as
+ CVE-2012-4194, CVE-2012-4195, CVE-2012-4196.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 26 Oct 2012 20:46:21 +0200
+
+iceweasel (16.0.1-1) experimental; urgency=high
+
+ * New upstream release.
+ * Fixes for mfsa2012-{88-89}, also known as
+ CVE-2012-4191, CVE-2012-4192, CVE-2012-4193.
+
+ * config/autoconf.mk.in, configure.in, extensions/gio/Makefile.in,
+ toolkit/library/Makefile.in, toolkit/library/nsStaticXULComponents.cpp:
+ toolkit/toolkit-tiers.mk: Actually build the GIO extension in libxul.
+ bz#799441.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 12 Oct 2012 00:24:42 +0200
+
+iceweasel (16.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2012-{74-77,79-87}, also known as
+ CVE-2012-3983, CVE-2012-3982, CVE-2012-3984, CVE-2012-3985,
+ CVE-2012-3985, CVE-2012-3986, CVE-2012-3988, CVE-2012-3989,
+ CVE-2012-3991, CVE-2012-3994, CVE-2012-3993, CVE-2012-4184,
+ CVE-2012-3992, CVE-2012-3995, CVE-2012-4179, CVE-2012-4180,
+ CVE-2012-4181, CVE-2012-4182, CVE-2012-4183, CVE-2012-4185,
+ CVE-2012-4186, CVE-2012-4187, CVE-2012-4188, CVE-2012-3990.
+
+ * debian/rules: Use xz compression for binary packages. Closes: #686325.
+ * debian/xulrunner.mozconfig: Enable gio protocol-handler and icon decoder.
+ * debian/control*:
+ - Bump libnspr4-dev build dependency to 4.9.2.
+ - Bump libsqlite3-dev build dependency to 3.7.13.
+ * debian/iceweasel.install, debian/iceweasel.links.in: Install webapprt
+ files.
+
+ * media/webrtc/trunk/src/modules/video_coding/codecs/vp8/main/source/vp8.cc:
+ Fix to build against libvpx 1.1.
+ * extensions/gio/Makefile.in: Build the GIO extension in libxul. bz#799441.
+ * webapprt/gtk2/Makefile.in, webapprt/gtk2/webapprt.cpp: Don't search firefox
+ executable in $exe/../../dist/bin. bz#798233.
+ * webapprt/gtk2/webapprt.cpp: Fallback to the xulrunner subdirectory if
+ webapprt can't find xpcom in firefox directory. bz#762833.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 09 Oct 2012 15:13:08 +0200
+
+iceweasel (15.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 16 Sep 2012 09:18:40 +0200
+
+iceweasel (15.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2012-{57-66,68-70,72}, also known as
+ CVE-2012-1971, CVE-2012-1970, CVE-2012-1972, CVE-2012-1973,
+ CVE-2012-1974, CVE-2012-1975, CVE-2012-1976, CVE-2012-3956,
+ CVE-2012-3957, CVE-2012-3958, CVE-2012-3959, CVE-2012-3960,
+ CVE-2012-3961, CVE-2012-3962, CVE-2012-3963, CVE-2012-3964,
+ CVE-2012-1956, CVE-2012-3965, CVE-2012-3966, CVE-2012-3968,
+ CVE-2012-3967, CVE-2012-3969, CVE-2012-3970, CVE-2012-3971,
+ CVE-2012-3972, CVE-2012-3973, CVE-2012-3975, CVE-2012-3976,
+ CVE-2012-3978, CVE-2012-3980.
+
+ * debian/iceweasel.mozconfig: Build iceweasel with system ply.
+ * debian/xulrunner-GRE_VERSION.install.in: Don't install xulrunner-bin, as
+ it's gone.
+ * debian/rules: Also use an epoch for iceweasel-l10n-all.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 29 Aug 2012 08:19:45 +0200
+
+iceweasel (14.0.1-2) experimental; urgency=low
+
+ * mfbt/double-conversion/utils.h: Declare double conversion correctness for
+ more architectures. bz#750620. Should fix FTBFSes on most (all?) Debian
+ architecures.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 19 Jul 2012 08:03:16 +0200
+
+iceweasel (14.0.1-1) experimental; urgency=high
+
+ * New upstream release.
+ * Fixes for mfsa2012-{42-56}, also known as
+ CVE-2012-1948, CVE-2012-1950, CVE-2012-1951, CVE-2012-1954,
+ CVE-2012-1953, CVE-2012-1952, CVE-2012-1966, CVE-2012-1955,
+ CVE-2012-1957, CVE-2012-1958, CVE-2012-1959, CVE-2012-1960,
+ CVE-2012-1961, CVE-2012-1962, CVE-2012-1963, CVE-2012-1964,
+ CVE-2012-1965, CVE-2012-1967.
+ * debian/rules: Remove packager fatal warnings.
+ * debian/xulrunner-GRE_VERSION.install.in: Don't install run-mozilla.sh and
+ xpcshell in usr/lib/xulrunner-x.y. They are in the SDK, now.
+ * debian/check_resources.py: Allow missing manifests when checking
+ resources.
+
+ * browser/installer/package-manifest.in: Install URL classifier components
+ when MOZ_URL_CLASSIFIER is set. bz#762617.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 17 Jul 2012 12:13:48 +0200
+
+iceweasel (13.0.1-2) experimental; urgency=low
+
+ * debian/control*: Change font suggestions for MathML. Closes: #679469.
+ * dom/ipc/Makefile.in, dom/ipc/PBrowser.ipdl, dom/ipc/TabMessageUtils.cpp:
+ Only export TabMessageUtils.h in mozilla/dom. bz#761082. Closes: #675920.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 29 Jun 2012 09:56:00 +0200
+
+iceweasel (13.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 16 Jun 2012 08:00:38 +0200
+
+iceweasel (13.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2012-{34,36-38,40}, also known as
+ CVE-2012-1938, CVE-2012-1937, CVE-2011-3101, CVE-2012-1944,
+ CVE-2012-1945, CVE-2012-1946, CVE-2012-1947, CVE-2012-1940,
+ CVE-2012-1941.
+
+ * debian/check_resources.overrides: Remove now unused entries.
+ * debian/rules: Adjust mozjs includes copied in libmozjs-dev.
+ * debian/installer/Makefile.in: Use DEFINES from browser/installer to
+ build package manifests.
+ * debian/branding/Makefile.in, debian/extra-stuff/Makefile.in,
+ debian/installer/*: Remove build script compatibility with Firefox < 4.0.
+
+ * browser/components/migration/content/migration.js,
+ browser/components/migration/content/migration.xul,
+ browser/components/migration/src/BrowserProfileMigrators.manifest,
+ browser/components/migration/src/FirefoxProfileMigrator.js,
+ browser/components/migration/src/ProfileMigrator.js,
+ browser/locales/en-US/chrome/browser/migration/migration.dtd,
+ browser/locales/en-US/chrome/browser/migration/migration.properties,
+ l10n-*/browser/chrome/browser/migration/migration.properties,
+ toolkit/content/aboutSupport.js, toolkit/content/jar.mn,
+ toolkit/content/resetProfile.js, toolkit/profile/nsIProfileMigrator.idl,
+ toolkit/xre/nsAppRunner.cpp: Make the "Reset Firefox" feature more
+ generic. bz#756390. Closes: #673353.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 05 Jun 2012 09:31:15 +0200
+
+iceweasel (12.0-7) experimental; urgency=low
+
+ * debian/rules: Also set LDFLAGS from dpkg-buildflags (although in practice
+ it changes nothing because relro is disabled)
+ * debian/control*:
+ - Force build and runtime dependency on libsqlite3-0 >= 3.7.12-1~ for a
+ right value of SQLITE_MAX_SCHEMA_RETRY and SQLITE_MAX_DEFAULT_PAGE_SIZE.
+ - Suggest fonts-lyx. Closes: #673222.
+ - Make xulrunner-dbg depend on nspr and nss debug packages.
+ * debian/xulrunner-GRE_VERSION.links.in,
+ debian/xulrunner-GRE_VERSION.install.in: Move omni.ja to
+ /usr/lib/xulrunner-x.0 because it contains arch-depend data.
+ * debian/xulrunner.mozconfig: Use system cairo again.
+
+ * gfx/thebes/gfxPlatform.cpp: Make system cairo work again. bz#722975.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 17 May 2012 11:59:46 +0200
+
+iceweasel (12.0-6) experimental; urgency=low
+
+ * ipc/chromium/src/base/file_util_linux.cc,
+ ipc/chromium/src/base/message_pump_libevent.cc,
+ ipc/chromium/src/base/time_posix.cc: gcc 4.7 build failures (missing
+ headers). bz#725655.
+ * layout/base/tests/TestPoisonArea.cpp: fix build failures with Clang and
+ GCC 4.7 in TestPoisonArea.cpp. bz#734490.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 11 May 2012 19:09:23 +0200
+
+iceweasel (12.0-5) experimental; urgency=low
+
+ * debian/xulrunner-GRE_VERSION.1.in: Fix xulrunner-x.y manual page to say
+ XULRunner instead of Iceweasel.
+
+ * gfx/skia/include/core/SkMath.h, gfx/skia/include/core/SkPostConfig.h,
+ gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp,
+ gfx/skia/src/opts/SkBlitRow_opts_arm.cpp: Fixup for bz#751814, and
+ refreshed as sent upstream. Should fix FTBFS on armel and armhf.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 11 May 2012 10:46:18 +0200
+
+iceweasel (12.0-4) experimental; urgency=low
+
+ * memory/jemalloc/jemalloc.c: Don't hardcode page size on sparc.
+ * gfx/skia/include/core/SkPreConfig.h: Fixup for bz#749533 for Hurd.
+ * gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp,
+ * gfx/skia/src/opts/SkBlitRow_opts_arm.cpp: Various Skia fixes for ARMv4T
+ and ARMv6+. bz#751814.
+ * js/src/Makefile.in, js/src/assembler/jit/ExecutableAllocator.h,
+ js/src/jsapi.cpp, js/src/jscntxt.cpp, js/src/jscntxt.h: Refresh to use
+ the last version of bz#691898 + some cleanup.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 04 May 2012 09:11:59 +0200
+
+iceweasel (12.0-3) experimental; urgency=low
+
+ * ipc/chromium/src/base/atomicops_internals_mips_gcc.h: Import
+ atomicops_internals_mips_gcc.h from protobuf. bz#749530.
+ * gfx/skia/include/core/SkPreConfig.h: Add support for GNU/kFreeBSD and Hurd
+ in SKIA. bz#749533.
+ * browser/locales/en-US/searchplugins/google.xml: Fix Google search plugin.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 27 Apr 2012 08:47:34 +0200
+
+iceweasel (12.0-2) experimental; urgency=low
+
+ * js/src/jsapi.cpp: Fixup for bz691898. Should fix FTBFSes.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 26 Apr 2012 20:28:58 +0200
+
+iceweasel (12.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2012-{20,22-24,26-33}, also known as
+ CVE-2012-0467, CVE-2012-0468, CVE-2012-0469, CVE-2012-0470,
+ CVE-2012-0471, CVE-2012-0473, CVE-2012-0474, CVE-2012-0475,
+ CVE-2012-0477, CVE-2012-0478, CVE-2011-3062, CVE-2011-1187,
+ CVE-2012-0479.
+
+ * debian/control*: Bump libsqlite3-dev build dependency.
+ * debian/xulrunner.mozconfig: Use in-tree cairo until things settle down
+ for bz#722975.
+ * debian/rules:
+ - Remove update-settings.ini.
+ - Remove MOZ_PHOENIX define, it's not useful anymore.
+ * debian/make.mk, debian/rules, debian/upstream.mk: Avoid spawning shells
+ from debian/rules when possible.
+ * debian/rules, debian/control*:
+ - Remove special case for Lenny, it's not supported anymore.
+ - Build with hardening flags. Closes: #609975.
+ * debian/iceweasel.mozconfig, debian/rules: Move --with-branding option to
+ debian/rules.
+ * debian/control, debian/l10n, debian/rules: Simplify l10n control
+ generation.
+
+ * memory/jemalloc/jemalloc.c: Fix jemalloc mmap wrapper for s390. bz#747322.
+ Closes: #667901.
+ * toolkit/components/search/nsSearchService.js: Handle transition to
+ /etc/<appname>/searchplugins more gracefully. Closes: #666675.
+ * js/xpconnect/src/xpcprivate.h: Properly align XPCLazyCallContext::mData.
+ bz#747870. Closes: #669905.
+ * config/Preprocessor.py, config/tests/unit-Preprocessor.py,
+ js/src/config/Preprocessor.py: Use filters in #defines and #includes.
+ bz#508942.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 24 Apr 2012 08:21:07 +0200
+
+iceweasel (11.0-4) experimental; urgency=low
+
+ * debian/branding/content/Makefile.in: Work around imagemagick svg support
+ broken by latest librsvg2-bin.
+ * debian/vendor.js: Default to en-US searchplugins when locale's aren't
+ found. Closes: #665817.
+ * debian/iceweasel.links.in, debian/iceweasel.preinst: Don't create
+ /usr/lib/iceweasel/distribution/searchplugins symlink.
+ * debian/extra-stuff/addonsInfo.js: Synchronously get addons list.
+ * debian/branding/aboutIce.js: Use Services.jsm in aboutIce.js.
+
+ * browser/components/dirprovider/DirectoryProvider.cpp: Load distribution
+ search plugins from /etc/<appname>/searchplugins.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 30 Mar 2012 19:22:56 +0200
+
+iceweasel (11.0-3) experimental; urgency=low
+
+ * debian/extra-stuff/addonsInfo.js: Remove debugging info from
+ dump-addons-info output, and avoid failure on addons that don't have the
+ getResourceURI method (like personas).
+ * debian/duckduckgo.xml: Add t=debian to duckduckgo query url.
+ * debian/iceweasel.install, debian/iceweasel.links.in,
+ debian/iceweasel.preinst, debian/rules: Move search plugins under
+ /etc/iceweasel. Closes: #632698.
+ * debian/l10n/recommends: Recommend xul-ext-mozvoikko instead of myspell-fi
+ for -l10n-fi. Closes: #635361.
+
+ * memory/jemalloc/jemalloc.c: Don't hardcode page size on ia64.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 23 Mar 2012 13:22:46 +0100
+
+iceweasel (11.0-2) experimental; urgency=low
+
+ * toolkit/library/Makefile.in: Fixup bz#734335 backport. Should fix all
+ FTBFSes.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 16 Mar 2012 08:35:43 +0100
+
+iceweasel (11.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2012-{12-19}, also known as
+ CVE-2012-0454, CVE-2012-0455, CVE-2012-0456, CVE-2012-0457,
+ CVE-2012-0451, CVE-2012-0458, CVE-2012-0459, CVE-2012-0460,
+ CVE-2012-0461, CVE-2012-0462, CVE-2012-0464.
+ * debian/source.filter: Adjusted to upstream changes.
+ * debian/rules:
+ - Work around make-makefile brokenness.
+ - Define MOZ_PHOENIX when building. Tab closing animation end fails
+ because of some telemetry items that aren't defined in xulrunner,
+ because they are enclosed in an ifdef MOZ_PHOENIX.
+ * debian/l10n/*, debian/control: Refreshed.
+ * debian/xulrunner-GRE_VERSION.install.in: update.locale is now in omni.ja.
+ * debian/control*:
+ - Bump build dependency on libnss3-dev and libnspr4-dev.
+ - Remove forced version-dependency on libnss3-1d.
+ * debian/dh/dh_xulrunner.in: Adjust to upstream changes.
+ * debian/check_resources.overrides: Ignore Webapps.jsm import from apps.js.
+
+ * toolkit/system/gnome/nsGSettingsService.cpp: Define
+ G_VARIANT_TYPE_STRING_ARRAY when building against older glib. bz#710972.
+ * netwerk/protocol/http/HttpChannelParent.*: Revert investigation patch for
+ bz#621446, which triggers an ICE on gcc 4.4.
+ * configure.in, toolkit/library/nsStaticXULComponents.cpp,
+ tools/profiler/Makefile.in, tools/profiler/sampler.h: Only build SPS on
+ supported platforms. bz#734335.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 14 Mar 2012 10:28:21 +0100
+
+iceweasel (10.0.3esr-1) unstable; urgency=low
+
+ * New upstream release.
+ - Avoid crashing when there are no GL extensions reported by the GL
+ implementation. bz#728656. Closes: #656611.
+ * Fixes for mfsa2012-{12-19}, also known as
+ CVE-2012-0454, CVE-2012-0455, CVE-2012-0456, CVE-2012-0457,
+ CVE-2012-0451, CVE-2012-0458, CVE-2012-0459, CVE-2012-0460,
+ CVE-2012-0461, CVE-2012-0462, CVE-2012-0464.
+ * debian/control, debian/l10n/*, debian/rules: Modify the way we use
+ isoquery to get a language name out of iso 639 codes.
+ * debian/upstream.mk:
+ - Better detect beta version given for download.
+ - Allow to use with iceape and icedove.
+ - Support download ESR releases.
+ * debian/iceweasel-runner, debian/iceweasel.1,
+ debian/iceweasel.README.Debian, debian/iceweasel.install,
+ debian/iceweaselrc: Remove dsp wrapper glue.
+ * debian/rules, debian/iceweasel.install, debian/iceweasel.links.in:
+ Localize search plugins.
+ * debian/upstream.mk, debian/repack.py, debian/l10n.filter: Filter l10n
+ upstream tarballs such that they stay the same when there are no changes
+ besides tags.
+ * debian/rules: Don't sign NSS libraries, as this is done as part of libnss3
+ build process.
+
+ * storage/src/mozStorageService.cpp: Don't crash an app using libxul because
+ of the lack of je_malloc_usable_size_in_advance. bz#720682. Closes: #660487.
+ * widget/src/xpwidgets/GfxInfoX11.*:
+ - Block OpenGL 1 drivers explicitly to steer clear of crashes. bz#696636.
+ - Block the Nouveau 3D driver with Mesa < 8.0.1. bz#729817.
+ * browser/components/dirprovider/DirectoryProvider.cpp: Try getting
+ general.useragent.locale as a complex value first. bz#515232.
+ * xpcom/glue/standalone/nsGlueLinkingDlopen.cpp: Avoid confusing gdb by
+ dependent libs being symbolic links.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 14 Mar 2012 08:57:15 +0100
+
+iceweasel (10.0.2-1) unstable; urgency=low
+
+ * New upstream release. Addresses CVE-2011-3026.
+ * debian/import-tar.py: Allow to import multi-tarball sources.
+ * debian/rules: Install js/*.h in /usr/include/mozjs/. Closes: #658315.
+ * debian/xulrunner.mozconfig, debian/control*: Build against system
+ python-ply.
+ * debian/control*: Build conflict with liboss4-salsa-dev.
+
+ * xpcom/typelib/xpidl/Makefile.in: Ship xpidllex.py and xpidlyacc.py.
+ bz#723861.
+ * config/autoconf.mk.in, configure.in, xpcom/idl-parser/Makefile.in,
+ xpcom/typelib/xpidl/Makefile.in: Allow to build with system python ply
+ library. bz#728229.
+ * browser/app/profile/firefox.js: Don't auto-disable extensions in system
+ directories. Closes: #656378 and friends.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 17 Feb 2012 18:40:48 +0100
+
+iceweasel (10.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2012-10, also known as CVE-2012-0452.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 11 Feb 2012 08:26:28 +0100
+
+iceweasel (10.0-3) unstable; urgency=low
+
+ * debian/upstream.mk: Add rule to download compare-locales for a given
+ release.
+ * debian/rules: Build locales from build-browser only, and use
+ compare-locales to merge them with en-US for non-existing strings.
+
+ * browser/locales/Makefile.in, toolkit/locales/Makefile.in: Revert previous
+ patch.
+ * browser/makefiles.sh: Add toolkit l10n Makefiles to browser/makefiles.sh.
+ bz#721737.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 10 Feb 2012 08:32:58 +0100
+
+iceweasel (10.0-2) unstable; urgency=low
+
+ * debian/control*: Bump libvpx-dev build dependency to 1.0.0.
+ * configure.in: Fix FTBFS with libvpx 1.0.0.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 05 Feb 2012 11:29:51 +0100
+
+iceweasel (10.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2012-{01-09}, also known as
+ CVE-2012-0442, CVE-2012-0443, CVE-2011-3670, CVE-2012-0445,
+ CVE-2011-3659, CVE-2012-0446, CVE-2012-0447, CVE-2012-0444,
+ CVE-2012-0449, CVE-2012-0450.
+
+ * debian/iceweasel.postinst: Remove /usr/lib/iceweasel/.autoreg on upgrade.
+ Closes: #648541.
+ * debian/source.filter: The PNG test suite moved.
+ * debian/xulrunner-GRE_VERSION.{links,install}.in: Hyphenation
+ dictionaries moved inside omni.jar.
+ * debian/control*: Bump libvpx-dev build dependency.
+ * debian/xulrunner-GRE_VERSION.*.in: Omni.jar was renamed omni.ja.
+ * debian/upstream.mk: Use a separate variable for download version.
+ * debian/rules: Call configure directly for build-browser, instead of
+ using dh_auto_configure. Closes: #656313.
+ * debian/upstream.mk: Add rules to download l10n sources.
+ * debian/rules, debian/control*, debian/l10n,
+ debian/branding/locales/Makefile.in: Add rules to build l10n packages.
+
+ * js/src/Makefile.in, js/src/vm/RegExpObject*, js/src/yarr/wtfbridge.h:
+ Use YARR interpreter instead of PCRE on platforms where YARR JIT is
+ not supported. bz#691898.
+ * browser/locales/Makefile.in, toolkit/locales/Makefile.in: Don't
+ build some toolkit l10n from browser/.
+ * l10n-ru/browser/chrome/browser-region/region.properties: Place google
+ and gmail before yandex. (imported from iceweasel-l10n)
+
+ -- Mike Hommey <glandium@debian.org> Wed, 01 Feb 2012 14:13:16 +0100
+
+iceweasel (9.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control*: Force xulrunner to depend on libnss3-1d >= 3.13.1.
+ It doesn't require symbols from versions that new, but it actually
+ requires some new flags being supported.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 22 Dec 2011 09:00:09 +0100
+
+iceweasel (9.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2011-{53-56,58}, also known as
+ CVE-2011-3660, CVE-2011-3661, CVE-2011-3658, CVE-2011-3663,
+ CVE-2011-3665.
+
+ * debian/test.mk: Remove hashbang.
+ * debian/control*:
+ - Build dependency on libidl-dev is not required anymore.
+ - Bump libsqlite3-dev build dependency.
+ - Bump libnss3-dev build dependency.
+ * debian/xulrunner-dev.install.in: Adapt to upstream changes.
+ * debian/check_resources.*, debian/rules: Check that resources:// urls are
+ appropriately used.
+
+ * build/unix/gnu-ld-scripts/jemalloc-standalone-linkage-version-script:
+ Revert previous patch, the file is not used anymore.
+ * browser/devtools/highlighter/TreePanel.jsm: Use resource:// urls
+ appropriately. bz#703633.
+ * js/src/methodjit/MethodJIT.cpp: Don't require 16 bytes alignment for
+ VMFrame on sparc. bz#698923.
+ * ipc/chromium/src/base/dir_reader_posix.h: Fix GNU/non-Linux failure to
+ build.
+ * js/src/assembler/assembler/ARMAssembler.cpp:
+ Fix ARMAssembler::getOp2RegScale on < ARMv5. bz#703531.
+ * js/src/jscompartment.cpp: Fix build failure on platforms without YARR JIT.
+ bz#703534.
+ * js/src/methodjit/TrampolineSparc.s: Avoid R_SPARC_WDISP22 relocation
+ in TrampolineSparc.s. bz#703842.
+ * js/src/jsgc.cpp: Avoid invalid conversion from 'const size_t*' to
+ 'const jsuword*' on s390. bz#703833.
+ * gfx/angle/src/compiler/osinclude.h: Add support for GNU/kFreeBSD and
+ GNU/Hurd. bz#711353.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 20 Dec 2011 20:05:33 +0100
+
+iceweasel (8.0-3) unstable; urgency=low
+
+ * debian/rules: Don't remove lines beginning with # in preprocessed files.
+ Closes: #648143.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 09 Nov 2011 09:05:57 +0100
+
+iceweasel (8.0-2) unstable; urgency=low
+
+ * js/src/vm/String-inl.h: Add missing parts from bz#589735 for 8.0.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 08 Nov 2011 23:19:35 +0100
+
+iceweasel (8.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2011-{47-52}, also known as
+ CVE-2011-3648, CVE-2011-3651, CVE-2011-3652, CVE-2011-3654,
+ CVE-2011-3650, CVE-2011-3649, CVE-2011-3653, CVE-2011-3655.
+
+ * debian/*.in, debian/rules: Use @VARIABLE@ instead of ##VARIABLE## for
+ preprocessing.
+ * debian/rules:
+ - Use Preprocessor.py instead of sed for preprocessing.
+ - Application.ini tweaks for version aren't needed anymore.
+ - Add some dependencies to regenerate debian/control.
+ - Force MOZ_APP_BASE_VERSION to GRE_VERSION.
+ * debian/iceweasel.install, debian/rules, debian/test.mk: Build iceweasel
+ in build-browser/ instead of build-iceweasel/.
+ * debian/import-tar.py: Add a tool that dumps a tar as a git fast-import
+ stream.
+ * debian/rules, debian/control.in, debian/xulrunner-GRE_VERSION.links.in:
+ Rename SO_VERSION variable to JS_SO_VERSION and use the first digit of
+ GRE_VERSION to generate it.
+ * debian/noinstall.in: README.txt is not shipped anymore.
+ * debian/rules: Disable methodjit on sparc because of bz#698911.
+
+ * configure*: Disable dead symbol removal when failing to test for bz#670659.
+ bz#690682.
+ * js/src/jsscan.cpp: Properly handle EOF in TokenStream::getAtSourceMappingURL
+ on platforms with unsigned chars. bz#686283.
+ * js/src/assembler/assembler/ARMAssembler.h: LDRH/STRH/LDRSB/STRSB are
+ supported on ARMv5-. bz#694533.
+ * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp: Reimplement
+ NS_InvokeByIndex in C on S390 Linux. This will fix FTBFS on S390.
+ * config/config.mk, config/rules.mk, js/src/config/config.mk,
+ js/src/config/rules.mk: (Statically) link jemalloc to all programs. This
+ will solve FTBFS on ia64, and fits what is done in 9.0.
+ * browser/devtools/webconsole/HUDService.jsm,
+ browser/devtools/webconsole/test/browser/browser_webconsole_bug_651501_document_body_autocomplete.js,
+ browser/devtools/webconsole/test/browser/head.js: HUDService uses some
+ resource://gre/ urls that ought to be resource:///. bz#682217.
+ Closes: #638772.
+ * build/unix/gnu-ld-scripts/jemalloc-standalone-linkage-version-script:
+ Export the _IO_stdin_used symbol. bz#699734. This will fix FTBFS on
+ sparc.
+ * testing/xpcshell/runxpcshelltests.py: Read xpcshell process' stdout one
+ character at a time.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 08 Nov 2011 20:04:06 +0100
+
+iceweasel (7.0.1-4) unstable; urgency=low
+
+ * xpcom/base/nscore.h, xpcom/glue/nsID.h: Don't force nsID to align to
+ 64-bit boundary ; instead, use 32-bits comparisons in nsID::Equals,
+ effectively reverting bz#164580. Closes: #645371.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 15 Oct 2011 09:44:32 +0200
+
+iceweasel (7.0.1-3) unstable; urgency=low
+
+ * debian/branding/configure.sh: Set MOZ_APP_DISPLAYNAME in Iceweasel
+ branding. Closes: #644801.
+ * debian/xulrunner.mozconfig, debian/xulrunner-GRE_VERSION.install.in,
+ debian/rules: Enable GIO instead of gnome-vfs and GConf.
+ Partially fixes #410671.
+
+ * ipc/chromium/src/build/build_config.h: Update supported architectures
+ for IPC, as landed upstream. Closes: #644939.
+ * xpcom/base/nscore.h, xpcom/glue/nsID.h: Force nsID to align to 64-bit
+ boundary. bz#660335. Closes: #642762.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 14 Oct 2011 17:22:42 +0200
+
+iceweasel (7.0.1-2) unstable; urgency=low
+
+ * debian/repack.py: Improved in several ways.
+ * debian/rules: Install vm/* headers under /usr/include/mozjs.
+ Closes: #644086.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 04 Oct 2011 08:32:20 +0200
+
+iceweasel (7.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 30 Sep 2011 08:32:09 +0200
+
+iceweasel (7.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes various security issues, which CVE ids are not published yet.
+
+ * debian/branding/Makefile.in, debian/iceweasel.install: Remove document.png,
+ as it is not used anymore.
+ * debian/branding/content/Makefile.in, debian/branding/content/jar.mn: Stop
+ jarring up a copy of mozicon128.png that aboutHome no longer uses.
+ * debian/rules: Don't remove /usr/lib/xulrunner-7.0/libmozjs.so*, they're not
+ installed there anymore.
+ * debian/iceweasel.mozconfig: Add --disable-libjpeg-turbo to work around
+ configure checking for yasm on APP build.
+
+ * js/src/Makefile.in: Only add -DENABLE_JIT=1 to CXXFLAGS if any of
+ trace/method/regex jit is enabled. bz#670719. Fixes FTBFSes on
+ powerpc and s390.
+ * js/src/jsregexpinlines.h, js/src/yarr/OSAllocatorPosix.cpp,
+ js/src/yarr/wtfbridge.h: build fix for ENABLE_YARR_JIT=0. bz#665819.
+ * xpcom/glue/pldhash.c: Work around recent ARM GNU ld bug with
+ -fdata-sections and variables names starting with "stub" leading to crash.
+ bz#675618. Also avoids elfhack crash during build.
+ * js/src/assembler/wtf/Platform.h: Don't enable YARR JIT on MIPS, as the
+ implementation is missing. bz#680642.
+ * js/src/yarr/BumpPointerAllocator.h: Use a pool size of 16kB on ia64 for
+ bump pointer allocator. bz#680917.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 28 Sep 2011 08:51:02 +0200
+
+iceweasel (6.0.2-1) unstable; urgency=medium
+
+ * New upstream release to strengthen the libnss3 response to the
+ DigiNotargate.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 06 Sep 2011 08:32:55 +0200
+
+iceweasel (6.0-4) unstable; urgency=low
+
+ * js/src/jsstrinlines.h: Fix-up bz#589735 backport. Should fix ia64 FTBFS.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 27 Aug 2011 09:07:06 +0200
+
+iceweasel (6.0-3) unstable; urgency=low
+
+ * debian/libmozjs-dev.install: Add more missing headers to libmozjs-dev.
+ * debian/rules, debian/xulrunner-GRE_VERSION.install.in: Install
+ plugin-container on all architectures. Closes: #639289.
+ * debian/extra-stuff/reportbug-helper-script: Avoid listing all debian
+ packages in the reportbug helper when no addons are installed.
+ * debian/duckduckgo.xml, debian/iceweasel.install: Add DuckDuckGo search
+ plugin. Closes: #616115.
+
+ * js/src/jsgcinlines.h, js/src/jsnum.cpp, js/src/jsstr.cpp, js/src/jsstr.h,
+ js/src/jsstrinlines.h, js/src/jstracer.cpp, js/src/jstracer.h,
+ js/src/tracejit/Writer.cpp: Allow static JS strings to be turned off;
+ turn off on ia64. bz#589735.
+ * memory/jemalloc/jemalloc.c: Allocate memory with an address with high 17
+ bits clear on ia64. bz#589735. This should finally make Iceweasel
+ actually work on ia64.
+ * js/src/jsval.h, js/src/jsvalue.h: Fix jsval_layout on 64-bit big-endian
+ platforms. bz#674522. Closes: #638623.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 26 Aug 2011 09:48:52 +0200
+
+iceweasel (6.0-2) unstable; urgency=low
+
+ * debian/libmozjs-dev.install: Install mfbt/* files under
+ /usr/include/mozjs/mozilla. Closes: #637984.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 20 Aug 2011 09:13:06 +0200
+
+iceweasel (6.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2011-29, including:
+ CVE-2011-2989, CVE-2011-2991, CVE-2011-2992, CVE-2011-2985,
+ CVE-2011-2993, CVE-2011-2988, CVE-2011-2987, CVE-2011-0084,
+ CVE-2011-2990, CVE-2011-2986.
+ * debian/control*:
+ - Bump build dependency on nspr, nss and sqlite.
+ - Build-depend on libjpeg-dev instead of libjpeg62-dev. Closes: #636452.
+ - Remove xprint suggest. Closes: #626794.
+ * debian/rules:
+ - Official branding moved to browser/branding/official.
+ - Don't set -std=gnu++0x ourselves, upstream build system now does it for
+ us.
+ - Remove libmozjs.so* from /usr/lib/xulrunner-6.0.
+ - Link npapi_getinfo against libpthread for GNU/Hurd.
+ * debian/installer/package-manifest.xulrunner,
+ debian/xulrunner-dev.install.in: Install xpt.py from sdk instead of xpt_*
+ from /usr/lib/xulrunner-6.0.
+ * debian/xulrunner-GRE_VERSION.install.in,
+ debian/xulrunner-GRE_VERSION.links.in: Add hyphenation dictionary. This is
+ temporary until we use libreoffice.org's.
+ * debian/iceweasel.desktop: Add german translation for the Iceweasel menu
+ item. Thanks Ronny Standtke. Closes: #629924.
+
+ * layout/build/Makefile.in, toolkit/library/Makefile.in: Unbreak build for
+ GNU/Hurd and GNU/kFreeBSD (since they don't have libossaudio). bz#673460.
+ * ipc/chromium/src/base/debug_util_posix.cc,
+ ipc/chromium/src/base/third_party/nspr/prcpucfg.h,
+ ipc/chromium/src/build/build_config.h: Allow ipc code to build on GNU/Hurd.
+ Closes: #636750.
+ * configure*: Revert "Allow to build against SQLite 3.7.3".
+
+ -- Mike Hommey <glandium@debian.org> Mon, 15 Aug 2011 18:16:55 +0200
+
+iceweasel (5.0-6) unstable; urgency=low
+
+ * debian/rules: ia64 doesn't support stabs debugging information, so use a
+ different workaround: use -O2 instead of -Os.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 30 Jul 2011 10:31:55 +0200
+
+iceweasel (5.0-5) unstable; urgency=low
+
+ * debian/rules:
+ - Don't add -g to CFLAGS, the upstream build system does it.
+ - Use -gstabs on ia64, to work around ICE.
+ * xpcom/base/nsDebugImpl.cpp: Refresh with the patch from bz#643779 as
+ landed updstream. Closes: #635957.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 30 Jul 2011 08:48:19 +0200
+
+iceweasel (5.0-4) unstable; urgency=low
+
+ * debian/rules: Don't create a versioned shlibs for libmozjs.
+ * debian/xulrunner-dev.preinst.in: Add a preinst script to remove
+ /usr/lib/xulrunner-devel-GRE_VERSION/sdk/bin before upgrading from versions
+ <= 5.0-2. Closes: #634053.
+ * debian/control*:
+ - Use linux-any wildcard for libasound2-dev and libiw-dev Build-Depends
+ instead of using a list of negated architectures. Closes: #634629.
+ - Adjust some package descriptions. Closes: #633597.
+ - Bump Standards-Version to 3.9.2.0. No changes required.
+ * debian/extra-stuff/addonsInfo.js: Fix the addons info dumper to use the new
+ Addons Manager API. Closes: #603412.
+ * debian/xulrunner-GRE_VERSION.postinst.in,
+ debian/xulrunner-GRE_VERSION.prerm.in: Remove the xulrunner-stub
+ alternative. The reason why it was good to have in /usr/bin doesn't exist
+ anymore.
+ * debian/xulrunner-GRE_VERSION.postinst.in: Don't cleanup {compreg,xpti}.dat.
+ They've not been generated for a while.
+
+ * js/src/xpconnect/shell/xpcshell.cpp: Fixup for bz#671804.
+ * configure*: Revert "Put the crmf library before the NSS libraries".
+
+ -- Mike Hommey <glandium@debian.org> Fri, 22 Jul 2011 15:48:09 +0200
+
+iceweasel (5.0-3) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/control*: Fix build dependency on libsqlite3-dev.
+ * debian/rules:
+ - Replace sdk/bin files also in /usr/lib/xulrunner-5.0 with symbolic links.
+ - Use dist/include to find npapi.h when building npapi_getinfo.
+ * debian/control*, debian/rules: Use ${binary:Version} for iceweasel
+ dependency on xulrunner, now that they have the same version.
+ * debian/test.mk:
+ - Set the application directory for xpcshell tests.
+ - Set plugin path for all tests.
+ * debian/control*: Add a build dependency on ttf-dejima-mincho to avoid
+ reftest failure due to the lack of japanese font.
+ * debian/xulrunner-GRE_VERSION.lintian-overrides.in: Add a temporary lintian
+ override for libtheora embedding.
+
+ * js/src/Makefile.in: Fix namespace exporting.
+ * toolkit/mozapps/installer/packager.mk: Install sdk/bin with make install.
+ bz#639554.
+ * config/autoconf.mk.in: Use the first two digits of the version number for
+ the install directory. bz#445128.
+ * xulrunner/installer/Makefile.in: Revert previous change for the version
+ number here, it concerns something that isn't built anymore and will go
+ away.
+ * embedding/android/GeckoAppShell.java, ipc/glue/GeckoChildProcessHost.cpp,
+ other-licenses/android/APKOpen.cpp, toolkit/xre/nsAppRunner.cpp,
+ toolkit/xre/nsEmbedFunctions.cpp, xpcom/build/Omnijar.*,
+ xpcom/build/nsXPComInit.cpp: Updated part 3 of bz#620931.
+ * js/src/xpconnect/shell/xpcshell.cpp: Add a -a option to xpcshell to set
+ an application directory. bz#620931 (part 6)
+ * browser/installer/Makefile.in, browser/installer/precompile_cache.js:
+ Make startup cache generation work better with new omni.jar handling.
+ bz#620931 (part 7)
+ * toolkit/components/places/tests/unit/test_database_replaceOnStartup.js:
+ Don't modify in-tree default.sqlite. bz#666709, bz#668906.
+ * storage/src/mozStorageService.cpp,
+ storage/test/unit/test_storage_service.js: Add a safeguard to
+ openUnsharedDatabase. bz#668906.
+ * toolkit/mozapps/downloads/tests/unit/test_DownloadUtils.js: Fix with
+ locales with a different decimal separator. bz#671533.
+ * xpcom/build/nsXPComInit.cpp: Initialize NS_XPCOM_LIBRARY_FILE from
+ NS_GRE_DIR. bz#671564.
+ * testing/xpcshell/runxpcshelltests.py: Allow to pass an application
+ directory to xpcshell tests. bz#671562.
+ * modules/plugin/test/unit/head_plugins.js, netwerk/test/unit/test_socks.js,
+ toolkit/mozapps/extensions/test/xpcshell/test_plugins.js: Fix some tests
+ using CurProcD where GreD should be used.
+ * xpcom/tests/unit/test_iniProcessor.js: Cleanup temporary files from
+ test_iniProcessor.js. bz#671570.
+ * modules/libpref/test/unit/test_libPrefs.js: Cleanup temporary files from
+ test_libPrefs.js. bz#671576. Together with bz#671570 and bz#666709 above,
+ Closes: #632890.
+ * toolkit/mozapps/extensions/test/xpcshell/test_update.js: Don't hardcode
+ en-US in test_update.js. bz#671631.
+ * modules/libpref/src/nsPrefService.cpp: Always load $gre/defaults/pref
+ prefs. bz#671798.
+ * js/src/xpconnect/shell/xpcshell.cpp: Provide NS_APP_PREF_DEFAULTS_50_DIR
+ and NS_APP_PREFS_DEFAULTS_DIR_LIST in xpcshell dir provider. bz#671804.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 15 Jul 2011 12:04:39 +0200
+
+iceweasel (5.0-2) experimental; urgency=low
+
+ * debian/rules: Fix configure permissions for source tarballs generated from
+ mercurial.
+ * debian/test.mk: Create a xulrunner symbolic link in
+ build-iceweasel/dist/bin so that reftests work.
+ * debian/watch: Always get the latest release.
+
+ * js/src/nanojit/njconfig.cpp: Allow ARMv4T in nanojit.
+ * ipc/chromium/src/base/platform_thread_posix.cc,
+ ipc/chromium/src/base/third_party/nspr/prcpucfg.h,
+ ipc/chromium/src/build/build_config.h: Allow ipc code to build on
+ GNU/kfreebsd. Closes: #626314.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 01 Jul 2011 14:43:39 +0200
+
+iceweasel (5.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2011-{09,19-22,25-28}, also known as
+ CVE-2011-0061, CVE-2011-2374, CVE-2011-2375, CVE-2011-2373,
+ CVE-2011-2372, CVE-2011-2371, CVE-2011-2366, CVE-2011-2367,
+ CVE-2011-2368, CVE-2011-2369, CVE-2011-2370.
+
+ * debian/xulrunner-GRE_VERSION.install.in: /etc/gre.d is not used anymore.
+ * debian/branding/content/aboutDialog.css, debian/branding/content/jar.mn:
+ Updated branding.
+ * debian/rules: xulrunner and iceweasel now have the same version.
+ * debian/dh/dh_xulrunner.in: Modify the strings we try to find in the xpcom
+ standalone glue.
+
+ * other-licenses/bsdiff/Makefile.in: Fix bsdiff build failure with system
+ bzip2. bz#644692.
+ * layout/base/nsDocumentViewer.cpp: Use an integer type in
+ DocumentViewerImpl::SetMinFontSize, instead of float. bz#652139.
+ * browser/base/content/aboutDialog.*,
+ browser/branding/*/content/aboutDialog.css
+ browser/branding/*/content/jar.mn,
+ other-licenses/branding/firefox/content/aboutDialog.css,
+ other-licenses/branding/firefox/content/jar.mn: Move some parts of
+ aboutDialog.css into branding. bz#652306.
+ * configure.*: Disable building embedded libjpeg-turbo when building with
+ system libjpeg. bz#652399.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 20 Jun 2011 17:17:04 +0900
+
+iceweasel (4.0.1-4) experimental; urgency=low
+
+ * The 'I meant that to be in previous release but forgot' release.
+ * xulrunner/installer/Makefile.in: Add -lmozalloc in link flags provided in
+ libxul.pc. bz#662223.
+ * memory/mozalloc/mozalloc.h, memory/mozalloc/Makefile.in,
+ xpcom/xpcom-config.h.in: Define NS_ATTR_MALLOC and NS_WARN_UNUSED_RESULT
+ in xpcom-config.h, and include it from mozalloc.h. bz#662224.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 20 Jun 2011 15:29:09 +0900
+
+iceweasel (4.0.1-3) experimental; urgency=low
+
+ * debian/installer/Makefile.in: Remove MOZ_IPC ifdef, it's not strictly
+ required, and won't be defined anymore in 5.0.
+ * debian/rules:
+ - Use official branding as reference when comparing to ours.
+ - Construct GRE_VERSION from the first two digits in GRE_MILESTONE.
+ - Handle build id from the debian version number.
+ - Handle UPSTREAM_RELEASE correctly for beta releases.
+ - Set MOZ_UA_BUILDID on betas and releases.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 17 Jun 2011 11:39:56 +0900
+
+iceweasel (4.0.1-2) experimental; urgency=low
+
+ * xpcom/base/nsDebugImpl.h, xpcom/base/nsTraceRefcntImpl.h,
+ xpcom/glue/nsEnumeratorUtils.cpp, xpcom/io/nsUnicharInputStream.h,
+ intl/unicharutil/util/nsUnicharUtils.h, toolkit/xre/nsAppRunner.cpp,
+ embedding/browser/gtk/src/EmbedPrivate.cpp: Add missing constructors
+ according to 8.5 [dcl.init], para 9 in C++03, para 6 in C++0x,
+ because gcc 4.6 enforces it.
+ * ipc/chromium/src/chrome/common/ipc_message_utils.h: Fix for s390, where
+ size_t is unsigned long.
+
+ * debian/copyright: Updated to fit the replacement of the remove.nonfree
+ script. Closes: #624587.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 30 Apr 2011 19:29:34 +0200
+
+iceweasel (4.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2011-{12,17-18}, also known as
+ CVE-2011-0079, CVE-2011-0081, CVE-2011-0069, CVE-2011-0070,
+ CVE-2011-0068, CVE-2011-1202.
+
+ * debian/rules, toolkit/components/url-classifier/src/Makefile.in:
+ Remove alpha specific thungs because it is unsure they still have any
+ positive effect, and alpha has many other problems that would need fixing
+ if porters care.
+
+ * modules/libpr0n/encoders/png/nsPNGEncoder.cpp: Now that we use the bundled
+ PNG library, revert patch to use png_set_filter to avoid using write
+ filters.
+ * browser/app/Makefile.in, browser/app/profile/firefox.js,
+ browser/components/safebrowsing/Makefile.in,
+ browser/components/safebrowsing/content/application.js: Use
+ MOZ_OFFICIAL_BRANDING instead of MOZILLA_OFFICIAL to choose the shavar to
+ use for safebrowsing.
+ * modules/plugin/Makefile.in: Filter by toolkit instead of by OS to decide
+ whether to go into modules/plugin/test.
+ * xulrunner/app/xulrunner.js: Don't set extensions.dss.enabled at the XRE
+ level. It looks like the addons manager bug this would circumventing has
+ been fixed since 3.6.
+ * modules/plugin/base/src/nsPluginHost.cpp: Simplify MOZILLA_DISABLE_PLUGINS
+ environment variable handling.
+ * modules/libpr0n/test/reftest/pngsuite-ancillary/reftest.list: Revert what
+ was supposed to be a temporary patch.
+ * browser/components/build/Makefile.in: Revert our patch to link against
+ nspr, this was fixed upstream in a different location.
+ * security/manager/ssl/public/Makefile.in,
+ security/manager/ssl/public/nsIBadCertListener.idl,
+ security/manager/ssl/src/nsNSSIOLayer.*: Embedding as it existed is going
+ to go away in 5.0, don't fool ourselves in keeping that any longer.
+ * ipc/chromium/src/build/build_config.h: Add mips, hppa, ia64, s390 and sparc
+ defines.
+ * configure.in, gfx/ycbcr/Makefile.in: Reverted patch to avoid building ARM
+ neon code.
+ * gfx/ycbcr/yuv_convert_arm.cpp: Allow to build on armv4t.
+ * gfx/ycbcr/yuv_convert.cpp: Do runtime detection of NEON in
+ ConvertYCbCrToRGB565.
+ * xpcom/base/nsDebugImpl.cpp: Fix FTBFS in xpcom/base on armv4t differently.
+ * js/src/nanojit/NativeARM.cpp: Force NativeARM.o to have arch armv4t in its
+ .ARM.attributes.
+ * js/src/jsnum.h, js/src/jsvalue.h: Don't use std::signbit, and replace
+ JSDOUBLE_IS_* definitions with bitwise operations. bz#640494.
+ * js/src/shell/jsworkers.cpp: Get rid of STL algorithm use. bz#640494.
+ * js/src/configure.in: Update to landed version of bz#589744.
+ * configure.in, js/src/configure.in: Updated to latest version of bz#626035.
+
+ * debian/rules: Enable IPC on all architectures.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 29 Apr 2011 08:01:15 +0200
+
+iceweasel (4.0-3) experimental; urgency=low
+
+ * accessible/src/base/TextUpdater.cpp: Fix crash @nsAccessible::AsHyperText()
+ bz#643906. Closes: #619637.
+ * configure*, gfx/ycbcr/Makefile.in: Avoid building arm neon code. bz#547946.
+ * js/src/xpconnect/src/xpcprivate.h,
+ js/src/xpconnect/src/xpccallcontext.cpp: Ensure XPCCallContext string
+ cache is aligned. bz#634594.
+ * gfx/ots/include/opentype-sanitiser.h: strict alignment issues when
+ displaying OpenType fonts. bz#643137.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 27 Mar 2011 14:23:44 +0200
+
+iceweasel (4.0-2) experimental; urgency=low
+
+ * debian/rules: Define __ARM_PCS when building on armel. Fixes FTBFS with
+ gcc 4.5 not declaring either __ARM_PCS or __ARM_PCS_VFP.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 23 Mar 2011 15:45:17 +0100
+
+iceweasel (4.0-1) experimental; urgency=low
+
+ * New upstream release. It's actually the same as rc2.
+
+ * debian/rules: Adjust version checking for version 4.0.
+ * debian/control: Refreshed.
+
+ * ipc/chromium/Makefile.in: Fix FTBFS in IPC on Linux PPC, part 2.
+ * xpcom/base/nsDebugImpl.cpp: Fix FTBFS in xpcom/base on armv4t. bz#643779.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 22 Mar 2011 21:06:29 +0100
+
+iceweasel (4.0~rc2-2) experimental; urgency=low
+
+ * debian/rules: Actually disable methodjit on armel, instead of all other
+ architectures.
+ * ipc/chromium/src/build/build_config.h: Fix FTBFS in IPC on Linux PPC.
+ bz#643112.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 19 Mar 2011 11:42:44 +0100
+
+iceweasel (4.0~rc2-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * debian/rules: Modify gross hack on the version checks to make it work with
+ RC2, which claims to be final.
+ * debian/control*: Include our tee-enabled cairo NMU from mozilla.debian.net
+ in build dependencies.
+ * debian/rules:
+ - Add IPC support for powerpc.
+ - Disable methodjit on armel.
+
+ * gfx/layers/basic/BasicImages.cpp: fix bad rendering of video with 16-bits
+ displays. bz#640588. Closes: #617475.
+ * configure*: Allow to build against SQLite 3.7.3 for backports.
+ * js/src/Makefile.in: Avoid "The cacheFlush support is missing on this
+ platform" error on alpha, ia64, mips and s390.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 19 Mar 2011 09:01:30 +0100
+
+iceweasel (4.0~rc1-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ - Long link URLs are cropped in the middle instead of at the end.
+ Closes: #615853.
+ * debian/rules: Gross hack on the version checks to make it work with
+ RC, which claims to be final.
+ * js/src/jsnum.h, js/src/jsvalue.h: Use std::signbit when using js
+ headers in C++. Fixes FTBFS with -std=c++0x, which we use.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 10 Mar 2011 10:19:52 +0100
+
+iceweasel (4.0~b12-1) experimental; urgency=low
+
+ * New upstream beta release.
+ - Properly build documents with overflow:hidden elements. Closes: #562996.
+ - window.alert dialogs are not popups any more. Closes: #239105.
+ - Upscaling of images uses bilinear filtering. Closes: #596774.
+ - Various improvements to the :visited css support to mitigate history
+ sniffing. Closes: #560108.
+ - Properly render SVG files with flowRoot. Closes: #513885.
+ - Fullscreen mode doesn't prevent proper search engine from being used.
+ Closes: #514939.
+ - Authentication dialogs are not really popups anymore, so focus problems
+ with them are fixed. Closes: #609768.
+ - Better focus handling with location bar vs. content. Closes: #611354.
+ - Various fixes for use with cairo 1.10, which most notably fixes
+ animated GIFs. Closes: #589576.
+ * debian/rules: Handle beta versions in milestone check.
+ * This new version makes use of APNG files in the GUI that can't easily
+ be replaced with GIF versions, so we're switching back to the embedded
+ libpng library. As a consequence, the APNG related patches were dropped.
+
+ * debian/copyright: Updated, but there are most probably still things
+ missing.
+ * debian/rules, config/autoconf.mk.in: Bump base version to 2.0.
+ * debian/rules:
+ - Don't modify application.ini on the beta release.
+ - Adjust dh_xulrunner test to match the removal of unixprint plugin.
+ - Add new variables for packages lists, as required by
+ toolkit/mozapps/installer/packager.mk.
+ * debian/control*:
+ - Add a build dependency on mesa-common-dev.
+ - libmozjs4d doesn't break xulrunner-1.9.2.
+ - Build depend on libvpx-dev.
+ - Build depend on libnss3-dev >= 3.12.9~beta2.
+ - Build depend on libcairo2-dev >= 1.10.2-2~ for tee surfaces.
+ - Remove build-dep on libpng12-dev.
+ * debian/xulrunner-GRE_VERSION.install.in,
+ debian/xulrunner-GRE_VERSION.links.in: Adapt dh_install and dh_link data
+ files to new files in built application.
+ * debian/symbols.filter, debian/rules: Don't filter libmozjs symbols.
+ * debian/libmozjsSO_VERSION.symbols.*, debian/rules: Don't provide a
+ symbols file yet.
+ * js/src/Makefile.in: Bump libmozjs version.
+ * debian/xulrunner.mozconfig:
+ - Use internal png library. Works-around: #486827.
+ - Use system libvpx.
+ - Build with shared js library.
+ * debian/iceweasel.mozconfig:
+ - Disable webm support to avoid failure to build against libxul. This
+ doesn't remove webm support from underlying xulrunner.
+ - Build iceweasel without omni.jar until I figure out what to do with the
+ default profile.
+ * debian/xulrunner-GRE_VERSION.prerm.in,
+ debian/xulrunner-GRE_VERSION.postinst.in: Fit to new component
+ registration. The new component registration doesn't create compreg.dat
+ and xpti.dat anymore, and .autoreg is not used either.
+ python-xpcom and other similarly integrated components won't register
+ automatically until I either implement something to do so, or these
+ components get integrated as extensions.
+ * debian/branding:
+ - Remove brandTrade entity, we don't need it anymore.
+ - browserconfig.properties is now installed in the chrome.
+ - branding doesn't use xpcnativewrappers=yes anymore.
+ - Add icon16.png and icon128.png to branding. These are required for
+ the new about:home.
+ - Add missing contentaccessible=yes in content/jar.mn.
+ - Modify for the new about dialog.
+ - Use about:home as homepage.
+ * debian/iceweasel.install, debian/iceweasel.links.in: Don't install
+ browserconfig.properties from usr/lib/iceweasel, it's not shipped
+ anymore.
+ * debian/iceweasel.install:
+ - Don't install .autoreg, it isn't used anymore.
+ * debian/installer/Makefile.in: Define JAREXT when building package manifest.
+ * debian/noinstall.in: LICENSE file is not installed anymore.
+ * debian/iceweasel.install, debian/xulrunner-GRE_VERSION.install.in:
+ Install chrome.manifest in GRE and APP directories.
+ * debian/rules, debian/vendor.js: Set general.useragent.compatMode.firefox
+ instead of general.useragent.extra.firefoxComment.
+ * debian/rules, debian/iceweasel.install: Install vendor.js with dh_install
+ instead of manually in debian/rules.
+ * debian/watch: Updated.
+ * debian/xulrunner-GRE_VERSION.install.in,
+ debian/xulrunner-GRE_VERSION.links.in: Install omni.jar files for
+ xulrunner.
+ * debian/installer/Makefile.in, debian/installer/package-manifest.browser:
+ Properly handle the various MOZ_CHROME_FILE_FORMATs in the package
+ manifests.
+ * debian/source.filter: Don't remove branding from source tarball, it's
+ free as in speech.
+ * debian/test.mk:
+ - Don't skip but a few xpcshell tests.
+ - xpcshell-tests now need a X server.
+ - Remove the check-date-format-tofte.js test from its new location.
+ - Remove the test_handlerService.js test from its new location.
+ - dist/bin/distribution is not needed anymore.
+
+ * js/src/tracejit/Writer.*: "Fix" tracejit to build against nanojit headers
+ in dist/include/nanojit.
+ * configure.in, configure:
+ - Don't take toolkit from the libxul sdk, it's not provided in
+ mozilla-config.h anymore.
+ - Allow to build against nspr 4.8.6.
+ * layout/style/jar.mn, netwerk/protocol/res/nsResProtocolHandler.cpp,
+ browser/locales/Makefile.in, ipc/glue/GeckoChildProcessHost.cpp,
+ js/src/xpconnect/loader/mozJSComponentLoader.cpp, modules/libjar/nsJAR.cpp,
+ modules/libpref/src/nsPrefService.cpp,
+ netwerk/protocol/res/nsResProtocolHandler.cpp,
+ startupcache/StartupCache.cpp, toolkit/xre/nsAppRunner.cpp,
+ toolkit/mozapps/installer/packager.mk, toolkit/xre/nsEmbedFunctions.cpp,
+ toolkit/xre/nsXREDirProvider.cpp, xpcom/build/Makefile.in,
+ xpcom/build/Omnijar.*, xpcom/build/nsXPComInit.cpp,
+ xpcom/components/nsComponentManager.cpp, xulrunner/confvars.sh: Add support
+ for omni.jar in xulrunner. bz#620931.
+ * configure.in, configure, js/src/configure.in, js/src/configure:
+ Don't force build flags upon ARM compilers. bz#626035.
+ * js/src/configure.in: Fallback to perf measurement stub when perf_event_open
+ syscall isn't supported. bz#589744.
+ * config/rules.mk, js/src/config/rules.mk: Remove -ljs_static from test
+ linking flags. part of bz#584474.
+ * content/base/src/nsWebSocket.cpp: Use chrome://global url instead of
+ chrome://browser for websockets errors. bz#636960.
+ * toolkit/xre/nsAppRunner.cpp: Restore DESKTOP_STARTUP_ID if a restart is
+ required. bz#607900.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 26 Feb 2011 11:13:10 +0100
+
+iceweasel (3.6.13-3) UNRELEASED; urgency=low
+
+ * debian/branding/locales/en-US/brand.*: Changed vendorShortName to
+ Mozilla to fit upstream.
+ * debian/branding/Makefile.in, debian/branding/aboutIce.*,
+ debian/rules: Prepare aboutIce component to the XPCOM changes in
+ Gecko 2.0.
+ * debian/extra-stuff/Makefile.in, debian/extra-stuff/addonsInfo.*,
+ debian/extra-stuff/packages-static.xulrunner: Prepare extra components
+ to the XPCOM changes in Gecko 2.0.
+ * debian/iceweasel.install, debian/rules: Install vendor.js with dh_install
+ instead of manually in debian/rules.
+ * debian/extra-stuff/Makefile.in,
+ debian/extra-stuff/packages-static.xulrunner, debian/iceweasel.install,
+ debian/installer/Makefile.in, debian/installer/package-manifest.*,
+ debian/rules: Use packager.mk to install about:iceweasel files.
+ * debian/iceweasel.desktop: Add x-scheme-handler/http* MimeTypes.
+ Closes: #613109.
+
+ * browser/components/nsBrowserGlue.js: Unbrand Browser Glue Service.
+ * browser/locales/en-US/chrome/overrides/appstrings.properties,
+ browser/locales/Makefile.in: Use MOZ_APP_DISPLAYNAME to fill
+ appstrings.properties.
+ * browser/branding/*/locales/en-US/brand.dtd,
+ browser/base/content/credits.xhtml: Use &brandTrade; instead of ™.
+ * browser/base/content/credits.xhtml, browser/base/Makefile.in:
+ Use MOZ_APP_DISPLAYNAME to make credits.xhtml vary depending on branding.
+ * browser/locales/en-US/searchplugins/answers.xml,
+ browser/locales/en-US/searchplugins/google.xml,
+ browser/locales/Makefile.in: Modify search plugins depending on
+ MOZ_APP_NAME.
+ * browser/app/Makefile.in, browser/app/application.ini, browser/confvars.sh,
+ config/autoconf.mk.in, configure.in: Don't hardcode anything in
+ application.ini files. bz#525882.
+ * browser/components/safebrowsing/content/application.js,
+ browser/app/profile/firefox.js: Determine which phishing shavar to use
+ depending on MOZ_OFFICIAL.
+
+ * debian/branding/configure.sh, debian/branding/locales/en-US/brand.dtd:
+ Adjust Iceweasel branding to unbranding changes above.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 19 Feb 2011 13:47:22 +0100
+
+iceweasel (3.6.13-2) experimental; urgency=low
+
+ * debian/control: Refresh from debian/control.in.
+ * debian/*.mozconfig: Add a comment on top of mozconfig files to avoid
+ people using them.
+ * debian/remove.nonfree, debian/repack.py, debian/source.filter,
+ debian/watch: Update debian/watch and provide a script repacking
+ upstream source tarballs.
+ * debian/iceweasel.README.Debian: Fix for the default dsp wrapper behaviour.
+ * debian/iceweasel.desktop: Add russian translation. Closes: #608876.
+ Thanks Alexander Sashanov.
+ * debian/control.in, debian/rules, debian/xulrunner-GRE_VERSION.links.in:
+ Use /usr/share/myspell/dicts for dictionaries when building for lenny.
+ Closes: #609111.
+ * debian/extra-stuff/Makefile.in, debian/extra-stuff/debUpdateNotifier.*,
+ debian/extra-stuff/filemonitor/,
+ debian/extra-stuff/packages-static.xulrunner,
+ debian/xulrunner-GRE_VERSION.install.in: Remove update notifier, it's
+ not quite as helpful as it should be.
+ * debian/control.*:
+ - Relax libglib2.0-dev build dependency. 2.18.0 was only needed for
+ filemonitor, which we just removed.
+ - Add a minimum version for build dependency on libevent-dev, for
+ event_base_loopbreak() and event_base_new().
+
+ * testing/xpcshell/runxpcshelltests.py: Add a 2 minutes timeout on xpcshell
+ tests.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 09 Jan 2011 13:46:07 +0100
+
+iceweasel (3.6.13-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2010-{74-84}, also known as
+ CVE-2010-3776, CVE-2010-3777, CVE-2010-3769, CVE-2010-3771,
+ CVE-2010-3772, CVE-2010-3768, CVE-2010-3775, CVE-2010-3766,
+ CVE-2010-3767, CVE-2010-3773, CVE-2010-3774, CVE-2010-3770.
+ * debian/copyright: Updated to include gfx/ots.
+ * debian/libmozjsSO_VERSION.symbols.in: Add new symbols.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 10 Dec 2010 00:11:50 +0100
+
+iceweasel (3.6.12-2) experimental; urgency=low
+
+ * layout/base/tests/TestPoisonArea.cpp: Allow TestPoisonArea to work on
+ more architectures.
+ * layout/base/tests/Makefile.in: Revert previous hack to avoid building and
+ running TestPoisonArea.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 30 Oct 2010 10:46:09 +0200
+
+iceweasel (3.6.12-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fix for mfsa2010-73, also known as CVE-2010-3765.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 28 Oct 2010 09:21:33 +0200
+
+iceweasel (3.6.11-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2010-{64-69}, also known as
+ CVE-2010-3176, CVE-2010-3175, CVE-2010-3179, CVE-2010-3180,
+ CVE-2010-3183, CVE-2010-3177, CVE-2010-3178.
+ * debian/control*: Bump build dependencies on libnspr4-dev, libnss3-dev,
+ and libsqlite3-dev to fit what configure will be looking for.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 20 Oct 2010 02:15:38 +0200
+
+iceweasel (3.6.10-1) experimental; urgency=low
+
+ * New upstream release.
+ * config/JarMaker.py: Use errno.ENOENT instead of "2" in JarMaker.py.
+ bz#595459. Fixes FTBFS on Hurd.
+ * debian/rules, debian/xulrunner-dev.install.in: Build npapi_getinfo in
+ build-xulrunner/dist/bin, and use an RPATH. Some plugins depend on
+ libxpcom.so, and dlopen() from npapi_getinfo fails unless libxpcom.so
+ can be loaded too. Fixes FTBFS on hppa as a side effect.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 16 Sep 2010 09:15:51 +0200
+
+iceweasel (3.6.9-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes for mfsa2010-{49-51,53-57,59-63}, also known as
+ CVE-2010-3169, CVE-2010-2765, CVE-2010-2767, CVE-2010-3166,
+ CVE-2010-2760, CVE-2010-3168, CVE-2010-3167, CVE-2010-2766,
+ CVE-2010-2762, CVE-2010-2763, CVE-2010-2768, CVE-2010-2769,
+ CVE-2010-2764.
+
+ * debian/README.Debian: Move to debian/iceweasel.README.Debian.
+ * debian/branding/content/*.png.uu (removed),
+ debian/branding/content/*-base.png, debian/source/include-binaries,
+ debian/branding/content/Makefile.in: Replace .uu files with their binary
+ counterpart, now that dpkg-dev supports binary files in the debian/
+ directory.
+ * debian/control*:
+ - Remove build dependency on sharutils.
+ - Install libmozjs debug symbols together with the xulrunner ones.
+ - Remove extra ~ in iceweasel version dependency on xulrunner, which
+ was only required for 3.6.4~build2.
+ * debian/rules:
+ - Refactor file preprocessing.
+ - Actually allow the build sequence to start from intermediate stamps.
+ - Don't fail to build if the build-xulrunner directory exists.
+ - Move .PHONY definitions for test targets to debian/test.mk.
+ - Add some sanity checks on version numbers.
+ - Use the new DEBIAN_RELEASE variable for dh_gencontrol.
+ - Enhance the check-system-libs rule to check in the all autoconf.mk
+ files.
+ - Further split build and install process in several stamped steps.
+ - Actually set CXX in default case, and re-export it.
+ - Move stamps creation at the end, so that "touch" always happens at
+ the end.
+ - Separate dh_xulrunner check from dh_install rule for better debugging.
+ * debian/test.mk:
+ - Move tests HOME directory into build-xulrunner/dist instead of now
+ nonexistent dist.
+ - Don't automatically modify TESTS when TEST_PATH is set.
+ - Force armel JIT to compile ARMv4T instructions during tests.
+ - Define generic -skip rules for tests.
+ - Put all tests requiring an application in a separate variable.
+ - Use iceweasel for reftest/crashtest.
+ * debian/reftest-app: Remove our custom reftest-app.
+ * debian/extra-stuff/Makefile.in: Remove duplicated variables definitions.
+ * debian/branding/content/jar.mn: Add missing aboutFooter.png to branding.
+ * debian/rules, debian/noinstall.in: Move testsuite related header field
+ removal to noinstall.in.
+ * debian/rules, debian/branding/jar.mn, debian/branding/Makefile.in: Check
+ the iceweasel branding installs all files provided by upstream unofficial
+ branding.
+ * debian/dh/dh_xulrunner.in:
+ - Fix small formatting issue in dh_xulrunner manual page.
+ - Remove debug output in dh_xulrunner.
+ * debian/rules, debian/dh/dh_xulrunner_test, debian/dh/dh_xulrunner.in:
+ Better check for the dh_xulrunner behaviour.
+ * debian/rules, debian/dh/npapi_getinfo.c, debian/dh/dh_xulrunner.in,
+ debian/xulrunner-dev.install.in: New dh_xulrunner feature: return
+ plugins handled mime types in a substvar.
+ * debian/xulrunner-dev.links.in: Install a symlink to nspr-config for the
+ SDK.
+ * debian/branding/firefox-branding.js: Unset startup.homepage_override_url
+ and startup.homepage_welcome_url. In other words, don't display anything
+ special after an upgrade or for the first time the browser is started.
+ * debian/xulrunner-GRE_VERSION.postinst.in,
+ debian/xulrunner-GRE_VERSION.prerm.in,
+ debian/xulrunner-GRE_VERSION.manpages.in,
+ debian/xulrunner-stub-GRE_VERSION.1.in: Add a /usr/bin/xulrunner-stub
+ binary in the form of an alternative, and a corresponding manual page.
+ * debian/smjs.1, debian/control*: Add a note that smjs is not recommended
+ for production use.
+
+ * gfx/qcms/iccread.c: Fix unaligned reads in qcms. bz#504766.
+ Closes: #591512.
+ * browser/components/privatebrowsing/src/nsPrivateBrowsingService.js: Align
+ -private description in --help output.
+ * js/src/nanojit/NativeARM.*, js/src/nanojit/avmplus.*,
+ js/src/nanojit/njcpudetect.h: Fix ARMv4T JIT support, and use patches as
+ landed in upstream nanojit.
+ * profile/dirserviceprovider/src/nsProfileLock.*,
+ toolkit/xre/nsSigHandlers.cpp: Support platforms without SA_SIGINFO.
+ bz#593767. Closes: #595535. Thanks Samuel Thibault.
+ * xulrunner/installer/*.pc.in: pkg-config files don't need to require the
+ version of nspr xulrunner was built against. Closes: #595842.
+
+ * testing/xpcshell/head.js, debian/test.mk: Revert previous temporary hacks
+ to track down kfreebsd buildd issues.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 08 Sep 2010 09:05:03 +0200
+
+iceweasel (3.6.8-2) experimental; urgency=low
+
+ * New upstream release.
+
+ [ iceweasel ]
+ * debian/iceweasel.install, debian/rules: Build in a subdirectory instead
+ of within the source directory.
+ * debian/iceweasel.mozconfig, debian/rules: Move most configure options
+ to a separate mozconfig file.
+ * debian/iceweasel.install: Install blocklist.xml.
+ * debian/noinstall, debian/rules: Remove some installed files from
+ debian/tmp, and use dh_install --fail-missing.
+ * debian/rules: Add --with-system-libxul configure option.
+ * debian/rules: Rename CONFIGURE_OPTIONS to CONFIGURE_FLAGS
+ * debian/control*:
+ - Reformat.
+ - Remove Eric Dorland from the Uploaders field. Given his limited time
+ and lost interest, Eric agreed to formally retire from iceweasel
+ maintenance. Thanks for all these years, Eric.
+
+ * build/Makefile.in, build/automation-build.mk: Revert cleaning patches.
+
+ [ xulrunner ]
+ * debian/control*, debian/extra-stuff/packages-static.xulrunner,
+ debian/libmozillainterfaces-java.*, debian/rules,
+ debian/xulrunner-BASE_VERSION.install.in: Remove unsupported javaxpcom
+ support.
+ * debian/rules, debian/test.mk: Build in a subdirectory instead of within
+ the source directory.
+ * debian/mozconfig*, debian/rules: Move default-mozilla-five-home
+ definition from mozconfig to debian/rules.
+ * debian/mozconfig, debian/rules: Rename mozconfig to xulrunner.mozconfig.
+ * debian/*: Rename BASE_VERSION to GRE_VERSION.
+
+ * Makefile.in, build/Makefile.in, build/automation-build.mk,
+ config/rules.mk, js/src/Makefile.in, js/src/config/rules.mk,
+ js/src/xpconnect/src/Makefile.in, testing/testsuite-targets.mk,
+ xpcom/tests/Makefile.in: Revert cleaning patches.
+ * extensions/java/xpcom/Makefile.in,
+ toolkit/toolkit-makefiles.sh: Revert javaxpcom patches.
+ * memory/jemalloc/jemalloc.c: Properly disable ncpus in jemalloc, which
+ the previous patch didn't do.
+
+ [ merged packages ]
+ * debian/control*, debian/rules: Merged iceweasel and xulrunner source
+ packages. Binary packages are kept as they were before.
+ * debian/copyright, debian/watch: Use Iceweasel's version.
+ * debian/changelog: Keep Iceweasel changelog. Xulrunner's go in a separate
+ debian/changelog.xulrunner file, for historical purpose. The file is not
+ installed in binary packages.
+ * debian/control*: Fix xulrunner-dev dependencies. As ${source:*Version}
+ will return iceweasel version, ${binary:Version} is better to use. It
+ turns out it is safe to use now xulrunner-dev is not Arch: all.
+ * debian/extra-stuff/Makefile.in:
+ - Fix to support subdirectory build.
+ - Avoid duplicated entries in generated jar manifest.
+ * debian/rules:
+ - Set LDFLAGS for iceweasel the same way xulrunner does.
+ - Export CFLAGS and CXXFLAGS directly from rules instead of setting them
+ when calling configure.
+ * debian/extra-stuff/Makefile.in, debian/noinstall*, debian/rules: Use
+ debian/noinstall to avoid installing some xulrunner files, instead of
+ filtering the package manifest.
+ * debian/rules, debian/*.manpages*: Use .manpages files instead of calling
+ dh_installman manually. Iceweasel was doing that, but not xulrunner.
+ * Skip version 3.6.8-1, as xulrunner packages versions numbers would then
+ be 1.9.2.8-1, which was already used.
+ * debian/reftest-app/defaults/preferences/reftest-app.js: Add a default
+ value for the dom.ipc.plugins.enabled pref to the reftest app.
+
+ * testing/xpcshell/head.js: Add a 2 minutes timeout on xpcshell tests.
+ * debian/test.mk: Add logging messages during xpcshell tests to track down
+ kfreebsd buildd issues.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 20 Aug 2010 21:57:53 +0200
+
+iceweasel (3.6.7-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes mfsa-2009-45, also known as CVE-2010-1206.
+ * debian/control:
+ - Remove conflict with very old package.
+ - Bump Standards-Version to 3.9.0.0.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 21 Jul 2010 00:21:17 +0200
+
+iceweasel (3.6.4-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 23 Jun 2010 15:27:03 +0200
+
+iceweasel (3.6.4~build2-1) experimental; urgency=low
+
+ * debian/copyright, debian/remove.nonfree: Update to fit new upstream
+ (pre)release.
+ * debian/iceweasel-runner: Don't override MOZ_APP_LAUNCHER, which was
+ already set.
+ * debian/firefox, debian/iceweasel.install, debian/iceweasel.postrm,
+ debian/iceweasel.preinst: Divert /usr/bin/firefox and put a wrapper script
+ instead. The wrapper script runs the diverted firefox if it exists, and
+ iceweasel otherwise. Closes: #576392.
+ * debian/README.Debian: Add a note about safe browsing in README.Debian.
+ Closes: #575039.
+ * debian/rules:
+ - Build with --std=gnu++0x.
+ - Don't check for libiw, necko wifi is part of libxul already.
+ * debian/control*:
+ - Remove dependency on psmisc as we've not been using fuser for years.
+ - Iceweasel 3.6.4~build2 needs to depend on xulrunner 1.9.2.4~build2.
+ * debian/branding/Makefile.in, debian/branding/aboutIce.js,
+ debian/branding/ice.*, debian/branding/jar.mn, debian/iceweasel.install:
+ Add a about:iceweasel page similar to about:mozilla. Closes: #413725.
+
+ * configure.in: Revert change to force not to use -fshort-wchar.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 03 May 2010 13:44:40 +0200
+
+iceweasel (3.6.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/rules, debian/control: Bump GRE version to 1.9.2.
+ * debian/branding/Makefile.in: document.png moved in upstream tarball.
+ * debian/patches/*: Refresh patches and add some more:
+ - More s/%APP%/firefox/ changes for 3.6.
+ - Additional --with-libxul-sdk changes for 3.6.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 02 Apr 2010 21:44:36 +0200
+
+iceweasel (3.5.9-2) unstable; urgency=low
+
+ * debian/remove.nonfree: There are still some .cvsignore files in the
+ upstream tarballs.
+ * debian/rules, debian/iceweasel.links.in, debian/iceweasel.bug-script.in,
+ debian/iceweasel.bug-control.in, debian/control.in, debian/control:
+ Generate GRE version dependent information from GRE_VERSION set in
+ debian/rules.
+ * debian/rules, debian/control*: Have iceweasel 3.5.x depend on xulrunner
+ 1.9.1.x at least. This will force upgrades of xulrunner when iceweasel
+ is upgraded.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 02 Apr 2010 20:08:22 +0200
+
+iceweasel (3.5.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * config/autoconf.mk.in: Revert previous changes to install in an
+ unversioned directory.
+ * debian/rules: Pass an installdir variable to install into
+ /usr/lib/iceweasel.
+ * debian/control:
+ - Suggest libkrb53 for backports.
+ - Build-depend on xulrunner-dev << 1.9.2.
+ * debian/iceweasel.prerm, debian/iceweasel.postinst: Remove old mozilla
+ alternative. I think there is no reason to keep this anymore.
+ * debian/iceweasel.links: Remove firefox and mozilla-firefox links.
+ It will help make transition to Firefox easier if that ever happens.
+ * debian/remove.nonfree: We now remove more non-free data. Also cleaned up
+ outdated stuff. Closes: #567915
+ * debian/source/format, debian/patches/*: Switch to 3.0 (quilt) format,
+ with patches.
+
+ * browser/components/safebrowsing/content/application.js,
+ browser/app/profile/firefox.js: Use googpub-phish-shavar instead of
+ goog-phish-shavar for safe browsing. This is a first step for fixing safe
+ browsing. Either the current setup will work if Google allows our client
+ string to get this data, or we'll be allowed to say we're firefox to the
+ safe browsing server. Closes: #561927.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 01 Apr 2010 16:23:51 +0200
+
+iceweasel (3.5.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * browser/components/nsBrowserContentHandler.js: Revert temporary hack to
+ force homepage_override to be triggered.
+ * extensions/reporter/resources/content/reporter/reporterOverlay.xul,
+ browser/base/content/baseMenuOverlay.xul: Resurrect release notes menu
+ item. Also resurrect the check for updates one, since it is #ifdef'ed on
+ something we disable.
+ * browser/components/safebrowsing/content/report-phishing-overlay.xul:
+ Revert the change in report phishing menu item location. Now we
+ resurrected the release notes item and restored the updateSeparator,
+ this change is pointless.
+ * browser/base/content/credits.xhtml: Correct old merge mistake.
+ * browser/locales/en-US/searchplugins/google.xml: Fix Google suggestions
+ in search box. Closes: #568004.
+ * build/Makefile.in: Remove leaktest files in make clean. bz#541769.
+ * build/Makefile.in, build/automation-build.mk, build/automation.py.in,
+ build/pgo/Makefile.in, layout/tools/reftest/Makefile.in,
+ testing/mochitest/Makefile.in: Don't remove build/automationutils.py
+ on make clean. bz#525047.
+ * build/automation-build.mk: Remove automation.py in make clean. bz#541768.
+
+ * debian/control:
+ - iceweasel provides gnome-www-browser: Closes: #568320.
+ - Bump Standards-Version to 3.8.4.0.
+ * debian/branding/firefox-branding.js:
+ - Add a release notes URL.
+ - Point to localized urls on mozilla.debian.net.
+ * debian/rules:
+ - Remove Debian revision from the User Agent string.
+ - Don't set distribution-id, it's only used in toolkit, i.e. xulrunner.
+ - Remove uneffective --disable-gtktest flag.
+ * debian/iceweasel.install, debian/wikipedia-en.xml: Remove
+ wikipedia-en.xml searchplugin. There is now a better search plugin (with
+ suggestions) provided upstream.
+ * debian/rules, debian/iceweasel.install, debian/debsearch.*: Refresh
+ debsearch search plugin.
+ * debian/iceweasel.1: Improve manual page for -P option. Closes: #568677.
+ * debian/iceweasel-xremote-client: Don't need to set LD_LIBRARY_PATH.
+ * debian/iceweasel.install, debian/rules: Don't install xpm files in
+ chrome/icons/default. They are not provided there upstream anymore,
+ there is no reason to do so.
+ * debian/rules, debian/*.svg, debian/iceweasel.install, debian/*.png.uu,
+ debian/branding: Move images generation and cleanup in debian/branding.
+ * debian/rules:
+ - Remove unused variables in debian/rules.
+ - Remove binary-indep rules, as we don't build an arch: all package
+ anymore.
+ - Don't unnecessarily set LD_LIBRARY_PATH when building.
+ - Remove old comments from dh-make templates.
+ - Use browser/config/version.txt content as UPSTREAM_VERSION.
+ - Use a variable for GRE version.
+ - Use the GRE directory as hint for dh_shlibdeps.
+ - Install the MPL license text in all packages.
+ - Don't fix permissions that don't need to be fixed.
+ * debian/README.Debian: Remove mostly irrelevant parts of README.Debian.
+ * debian/compat, debian/rules: Switch to dh.
+ * debian/iceweasel.postinst: Remove /usr/lib/iceweasel/updates on upgrades.
+ * debian/rules:
+ - There is no bashism in debian/rules anymore.
+ - Use make dependency to "generate" the MPL file.
+ - Set LDFLAGS at configure time.
+ * debian/vendor.js: Don't trigger the debAbout component. Now we have a
+ release notes link in about:, the debAbout generated links are pointless,
+ especially since they create problems in the target web pages
+ (e.g. unstyled BTS).
+ * debian/iceweasel-gnome-support.{prerm,postinst},
+ debian/iceweasel.{prerm,postinst}: Merge iceweasel-gnome-support
+ maintainer scripts into iceweasel ones.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 17 Feb 2010 22:46:30 +0100
+
+iceweasel (3.5.6-2) unstable; urgency=low
+
+ * debian/iceweasel-runner:
+ - Allow iceweasel-runner not to hardcode the iceweasel base directory.
+ Closes: #507120.
+ - Remove old compatibility stuff.
+ * debian/iceweasel.desktop: Only put the name in the Name field of the
+ freedesktop application file. Closes: #507961.
+ * debian/iceweasel.dirs:
+ - Make it clear that plugins should live in /usr/lib/mozilla/plugins/
+ by shipping the directory in the iceweasel package. Closes: #520676.
+ - Likewise for extensions in /usr/{lib,share}/mozilla/extensions/$app-id.
+ Closes: #564669.
+ * debian/control:
+ - Suggest ttf-lyx | latex-xft-fonts (latex-xft-fonts is kept for stable
+ users). Closes: #539537.
+ - Replace libkrb53 suggestion with libgssapi-krb5-2.
+ - Remove the iceweasel-gnome-support package.
+ - Rewrite the short description. Also slightly modify the long
+ description. Closes: #400858.
+ - Build conflict with libhildonmime-dev and libosso-dev. Closes: #544369
+ * debian/iceweasel.1:
+ - Fix trivial typo in the manual page. Closes: #528789.
+ - Synchronize manual page with iceweasel --help output, and add various
+ other information. Closes: #362020, #520660, #556258.
+ * debian/homepagereset.js, debian/iceweasel.install: Remove the
+ homepagereset component. It was used to reset the homepage user settings
+ if it were a very old value. Anyone using these old homepages should have
+ had their homepage reset by now.
+ * debian/control, debian/iceweasel.bug-presubj, debian/iceweasel.install,
+ debian/rules: Use dh_bugfiles instead of installing reportbug-related
+ files by hand.
+ * debian/iceweasel.bug-script: Add reportbug script to list addons.
+ This uses a new helper in xulrunner-1.9.1. Closes: #356647.
+ * debian/iceweasel.bug-control: Request xulrunner-1.9.1 dependency list in
+ bug reports.
+ * debian/branding/Makefile.in, debian/branding/firefox-branding.js:
+ Use http://mozilla.debian.net pages for homepage_override and welcome.
+ * browser/components/nsBrowserContentHandler.js: Temporary hack to force
+ homepage_override to be triggered. This hack is to be removed in next
+ release. Its sole purpose is to get people to see the pages on
+ http://mozilla.debian.net/ despite the upstream version not being bumped.
+ * debian/iceweasel.prerm: When removing the package, cleanup files
+ iceweasel creates if run as root.
+ * debian/iceweasel.install, debian/iceweasel.prerm: Make .autoreg part of
+ the package.
+ * debian/iceweasel-restart-required.update-notifier,
+ debian/iceweasel.install, debian/iceweasel.postinst: Remove update
+ notification through update-notifier
+ * browser/components/nsBrowserContentHandler.js,
+ browser/components/shell/src/nsSetDefaultBrowser.js: Fix misalignments
+ in --help command line. bz#458631.
+ * browser/base/content/browser.css: Favicons in search bar dropdown not
+ shown if menus_have_icons=false. bz#508221. Closes: #561902.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 03 Feb 2010 07:55:01 +0100
+
+iceweasel (3.5.6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 16 Dec 2009 11:08:01 +0100
+
+iceweasel (3.5.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/remove.nonfree: Synchronize with Iceape 2.0.
+ * debian/copyright: Update with missing information, and remove lcms
+ licensing as it was dropped in 3.5.
+ * debian/iceweasel-runner: Synchronize with Iceape 2.0's iceape-runner:
+ - Remove obsolete (and commented) Xprint support.
+ - Only handle --verbose, -V, -g and --debugger options.
+ - Output less variables when running verbosely.
+ * debian/README.Debian: Point to the proper file containing the
+ app.update.enabled setting.
+ * debian/rules: Properly modify {Min,Max}Version in application.ini.
+ * debian/control, debian/iceweasel.preinst: Removed upgrade path from
+ old firefox packages.
+ * debian/rules: Add a "like Firefox/version" string to the UA.
+ Closes: #399633.
+ * debian/control:
+ - Set the pkg-mozilla team as maintainer.
+ - Bump Standards-Version to 3.8.3.0.
+ * browser/components/sessionstore/src/nsSessionStore.js: Avoid wrong
+ sessionstore data to keep windows out of user sight.
+ Closes: #552426, #553453.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 12 Nov 2009 17:32:42 +0100
+
+iceweasel (3.5.4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 28 Oct 2009 16:36:06 +0100
+
+iceweasel (3.5.3-2) unstable; urgency=low
+
+ * debian/iceweasel-runner: Set the MOZ_APP_LAUNCHER in the runner script to
+ register the proper name with XSMP. Closes: #437999.
+ * debian/watch: Fix to fit new upstream tarball names.
+ Thanks Yan Morin <progysm@gmail.com>. Closes: #550482.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 10 Oct 2009 16:03:21 +0200
+
+iceweasel (3.5.3-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 10 Sep 2009 22:04:25 +0200
+
+iceweasel (3.5.2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 20 Aug 2009 07:30:00 +0200
+
+iceweasel (3.5.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/copyright:
+ - Fix GPL and LGPL text location.
+ - Update copyright information.
+ * debian/control:
+ - Add ${misc:Depends} in all binary packages dependencies.
+ - Set iceweasel-dbg's section to debug.
+ - Bumped Standards-Version to 3.8.2.0.
+ * debian/rules: Removed call to deprecated dh_desktop.
+ * debian/iceweasel.postinst: Remove call to update-desktop-database, which
+ is not in /usr/sbin anyways, and is called automatically (was added by
+ dh_desktop before, and run by desktop-file-utils triggers now).
+
+ -- Mike Hommey <glandium@debian.org> Fri, 17 Jul 2009 20:49:41 +0200
+
+iceweasel (3.5-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control, debian/rules, debian/iceweasel.links: Build against and
+ depend on xulrunner 1.9.1.
+ * configure.in, configure: Don't check for libasound.
+ * debian/branding/locales/en-US/brand.dtd: Add missing entity.
+ * browser/components/build/Makefile.in: Link against nspr.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 08 Jul 2009 07:59:42 +0200
+
+iceweasel (3.0.11-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 13 Jun 2009 20:33:30 +0200
+
+iceweasel (3.0.9-1) unstable; urgency=high
+
+ * New upstream release.
+ * Fixes mfsa-2009-20, also known as CVE-2009-1310.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 22 Apr 2009 21:18:38 +0200
+
+iceweasel (3.0.7-1) unstable; urgency=high
+
+ * New upstream release.
+ * Fixes mfsa-2009-11, also known as CVE-2009-0777.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 08 Mar 2009 11:23:28 +0100
+
+iceweasel (3.0.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes mfsa-2009-03, also known as CVE-2009-0355.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 04 Feb 2009 08:19:24 +0100
+
+iceweasel (3.0.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixes mfsa-2008-{63,69}, also known as CVE-2008-5505 and CVE-2008-5513.
+ * debian/vendor.js: Remove EULA override, since the EULA was removed
+ upstream, and its replacement has been made hidden to unofficial builds.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 20 Dec 2008 13:40:23 +0100
+
+iceweasel (3.0.4-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #505557)
+
+ [ Mike Hommey ]
+ * debian/iceweasel-gnome-support.postinst,
+ debian/iceweasel-gnome-support.prerm: Handle gnome-www-browser alternative.
+ Restored from 3.0~b5-3. Closes: #492286.
+ * debian/branding/locales/browserconfig.properties: Change the homepage to
+ about:. Closes: #499346
+ * browser/branding/unofficial/locales/browserconfig.properties: Revert
+ previous change, this is not the installed file.
+ * debian/homepagereset.js: Force homepage reset if it was previously set to
+ the granparadiso homepage.
+ * debian/iceweasel-restart-required.update-notifier: Added japanese
+ translation. Thanks Hideki Yamane. Closes: #503595.
+ * browser/components/shell/src/nsGNOMEShellService.cpp: Fix various problems
+ in the handling of GNOME background color. Closes: #495897.
+
+ [ Eric Dorland ]
+ * debian/iceweasel.desktop: Just specify "iceweasel" as the icon, so it
+ can pick the scalable one under certain circumstances. (Closes:
+ #451943)
+
+ -- Eric Dorland <eric@debian.org> Sun, 23 Nov 2008 01:32:40 -0500
+
+iceweasel (3.0.3-3) unstable; urgency=low
+
+ * browser/app/profile/firefox.js: Replace %APP% with firefox in some places.
+ Closes: #501540, #502450.
+ * browser/branding/unofficial/locales/browserconfig.properties: Change the
+ homepage to about:. Closes: #499346.
+ * browser/app/profile/firefox.js, browser/locales/en-US/firefox-l10n.js:
+ Remove general.useragent.locale prefs from firefox*.js. Closes: #495381.
+ * browser/components/feeds/src/FeedConverter.js: Allow external web feed
+ application to work without gnome libraries. Closes: #406380.
+ * debian/presubj: Minor changes and add a note about MOZILLA_DISABLE_PLUGINS
+ environment variable.
+ * debian/control: Depend on a version of xulrunner-1.9 that handles the
+ MOZILLA_DISABLE_PLUGINS environment variable.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 24 Oct 2008 08:16:02 +0200
+
+iceweasel (3.0.3-2) unstable; urgency=low
+
+ * debian/iceweasel-xremote-client, debian/iceweasel-runner: Use 'iceweasel'
+ as default application id instead of 'firefox'.
+ * debian/iceweasel.1: Update the manpage accordingly.
+ * Thanks to Sven Hartge. Closes: #501304, #501363, #501394, #501445.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 08 Oct 2008 07:36:53 +0200
+
+iceweasel (3.0.3-1) unstable; urgency=high
+
+ * New upstream release. (Closes: #500374)
+
+ * debian/presubj: Fix typo. Thanks Rémi Vanicat. (Closes: #444736)
+ * browser/app/application.ini: Our name should be Iceweasel and not
+ Firefox. This name here is used early in the startup, for things like
+ the group leader window name. (Closes: #428836)
+ * browser/app/application.ini: Set the profile path explicitely now that
+ we have a different application name.
+ * debian/iceweasel-runner: Add the -profile and
+ -install-global-extension to the list of single arg flags for
+ iceweasel. (Closes: #425874, #440455)
+ * debian/iceweasel.desktop: Fixed Finnish desktop file
+ translation. Thanks Timo Jyrinki. (Closes: #483941)
+
+ -- Eric Dorland <eric@debian.org> Mon, 06 Oct 2008 01:59:30 -0400
+
+iceweasel (3.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules:
+ - Install the 64x64 icon into the proper place. Closes: #479032.
+ - Broaden version range for the GRE in application.ini.
+ * browser/components/preferences/applications.js: Avoid spurious "Run" items
+ in application handlers configuration pane.
+ * browser/components/preferences/applicationManager.xul: Fix breakage of the
+ application manager by change to applications.js in 3.0~rc2-2.
+ * debian/iceweasel-runner: Don't set MOZILLA_NO_JEMALLOC when using aoss.
+ * debian/control:
+ - Depend on a version of xulrunner with a fixed jemalloc.
+ - Updated Standards-Version to 3.8.0.1. No changes required.
+ * debian/remove.nonfree: Don't remove files that don't exist anymore, and
+ properly remove some files with spaces in their name.
+ * debian/iceweasel.links: /usr/share/icons/hicolor/64x64/apps/iceweasel.png
+ is not a link anymore.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 14 Jul 2008 22:51:39 +0200
+
+iceweasel (3.0~rc2-2) unstable; urgency=low
+
+ * debian/iceweasel-runner:
+ - Fix startup with aoss as ICEWEASEL_DSP. Closes: #485623.
+ - Use MOZILLA_NO_JEMALLOC instead of LD_PRELOAD to disable jemalloc.
+ * browser/components/preferences/applications.js: Avoid failure to
+ initialize the applications preferences pane when the shell service is not
+ loaded, which happens when xulrunner-1.9-gnome-support is not installed.
+ Closes: #485765.
+ * browser/confvars.sh: Set MOZ_APP_NAME to iceweasel. This will make the
+ shell service use the proper path when setting the default browser.
+ Closes: #399632.
+ * configure, configure.in: Force to not use -fshort-wchar. Closes: #474281.
+ * debian/control:
+ - Build depend on version of xulrunner-dev that doesn't use -fshort-wchar.
+ - Depend on version of xulrunner-1.9 implementing MOZILLA_NO_JEMALLOC and
+ lockPref in preferences.
+ * debian/iceweasel.cfg: Removed.
+ * debian/iceweasel.install: Don't install iceweasel.cfg.
+ * debian/vendor.js: Moved the locked preference for app.update.enabled here,
+ now that can be done here with newest xulrunner-1.9. Note that
+ iceweasel.cfg was not taken into account due to general.config.filename
+ mistakenly not being set.
+ * debian/iceweasel.js: Fixed preferences location in /usr/lib/iceweasel and
+ added a note about lockPref.
+ * debian/rules, debian/iceweasel.install: Now that we don't have flat
+ chrome, we can't use icons from chrome/browser/content. Change links to
+ point to a proper location, and install missing 64x64 icon. Thanks
+ Franklin PIAT. Closes: #486521.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 21 Jun 2008 15:57:49 +0200
+
+iceweasel (3.0~rc2-1) unstable; urgency=low
+
+ * New upstream release candidate.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 07 Jun 2008 12:46:43 +0200
+
+iceweasel (3.0~rc1-1) experimental; urgency=low
+
+ * configure.in, configure: Fix LIBXUL_SDK_DIR variable use. Closes: #479041.
+ * debian/iceweasel-runner: Work around problems with aoss and libjemalloc by
+ preloading the glibc. Closes: #475166.
+ * debian/iceweasel.postinst:
+ - Remove any compreg.dat and xpti.dat that would be left from earlier runs
+ of iceweasel as root, causing possible random crashes with xpcom.
+ Closes: #481020.
+ - Touch .autoreg on install/upgrade, so that components registration is
+ triggered for the components provided by iceweasel.
+ * debian/control:
+ - Build depend on xulrunner-dev 1.9~rc1 and stop build depending on
+ xulrunner-1.9-common which was only required because of incompatible
+ platform.ini in xulrunner-1.9-common 1.9~b5-1.
+ - iceweasel depends on xulrunner >= 1.9~rc1.
+ * debian/about_debian.js: Removed, as this component will be provided by
+ xulrunner.
+ * debian/iceweasel.install: Don't install about_debian.js.
+ * debian/rules: Use proper flag to disable optimization.
+ * debian/branding/branding.nsi, debian/branding/content/contents.rdf:
+ Removed useless branding files.
+ * debian/branding/locales/en-US/brand.dtd: Removed useless entity.
+ * debian/vendor.js:
+ - Add package name for debAbout.js component.
+ - Avoid displaying useless EULA at iceweasel startup.
+ * debian/rules: Install debian/vendor.js and append
+ general.useragent.extra.firefoxComment there.
+ * configure.in, configure: Don't build libjemalloc when building against
+ libxul-sdk.
+ * browser/base/content/baseMenuOverlay.xul,
+ browser/components/safebrowsing/content/report-phishing-overlay.xul,
+ extensions/reporter/resources/content/reporter/reporterOverlay.xul:
+ Arrange menu overlays so that nothing ends up after "About Iceweasel".
+
+ -- Mike Hommey <glandium@debian.org> Sat, 24 May 2008 22:48:48 +0200
+
+iceweasel (3.0~b5-4) experimental; urgency=low
+
+ [ Eric Dorland ]
+ * debian/control:
+ - Add Replaces on iceweasel-gnome-support for imgicon move.
+ (Closes: #478084)
+ - Fix GNOME spelling errors.
+ - Remove binutils and dpkg-dev build dependencies that were workarounds
+ for broken version that are no longer in Debian.
+ * debian/rules: Add calls to dh_desktop.
+ * debian/iceweasel.postinst: Fix inverted check for a running
+ iceweasel. Thanks Andreas Beckmann. (Closes: #473756)
+ * debian/iceweasel.desktop: Add trailing semicolons to Categories and
+ Mimetype to comply the standard. Thanks Michael Biebl. (Closes:
+ #468117)
+
+ [ Mike Hommey ]
+ * debian/control:
+ - Replace a bunch of build dependencies with xulrunner-dev and
+ xulrunner-1.9-common (a versioned dependency is required for this one
+ because of an incompatible platform.ini in 1.9~b5-1).
+ - iceweasel now depends on xulrunner-1.9 (we rely on xulrunner-stub from
+ version 1.9~b5-4).
+ - iceweasel-dbg depends on xulrunner-1.9-dbg.
+ - iceweasel-gnome-support is transformed into a dummy package to install
+ xulrunner-1.9-gnome-support.
+ * debian/iceweasel-gnome-support.*: Removed.
+ * debian/iceweasel.install, debian/iceweasel.links:
+ - Don't install files that are provided by xulrunner-1.9, including the
+ firefox binary, which is a copy of xulrunner-stub.
+ - defaults/pref is now defaults/preferences.
+ - Install application.ini in /usr/lib/iceweasel instead of
+ /usr/share/iceweasel. Xulrunner following symlinks, it fails running
+ iceweasel without the file being in /usr/lib/iceweasel.
+ * debian/rules:
+ - Build against xulrunner-1.9.
+ - Don't install files in the iceweasel-gnome-support package and don't
+ filter anything in the iceweasel package.
+ - Don't set general.useragent.product and general.useragent.productSub,
+ they have no effect anymore.
+ - defaults/pref is now defaults/preferences.
+ - Remove specific CFLAGS for alpha and ppc64, since we don't build from
+ code that may require it.
+ - Properly cleanup debian/branding with clean rule.
+ * debian/iceweasel.links:
+ - Install the xulrunner-stub as a /usr/lib/iceweasel/firefox-bin symlink.
+ It will also allow smooth upgrade for those whose session manager stored
+ firefox-bin as iceweasel main executable.
+ - Help xulrunner-stub by pointing to xulrunner's home with a
+ /usr/lib/iceweasel/xulrunner symlink to /usr/lib/xulrunner-1.9.
+ * debian/iceweasel.postinst: Remove /usr/lib/iceweasel/.autoreg on upgrade.
+ * debian/iceweasel-xremote-client: Don't set MOZILLA_FIVE_HOME anymore.
+ * toolkit/library/Makefile.in,
+ xpcom/reflect/xptcall/src/md/unix/Makefile.in: Revert changes to these
+ files, as they are not used for the build anymore.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 01 May 2008 18:56:40 +0200
+
+iceweasel (3.0~b5-3) experimental; urgency=low
+
+ * debian/README.Debian: Change the paragraph about pango, since this is now
+ the only font backend and MOZ_DISABLE_PANGO is effectless.
+ * debian/presubj: Remove the paragraph about MOZ_DISABLE_PANGO.
+ * debian/iceweasel-runner: Don't export the MOZ_DISABLE_PANGO variable.
+ * debian/rules:
+ - Remove old unused stuff.
+ - Use upstream optimization flags.
+ - Arrange LDFLAGS so that -Wl,--as-needed appears before -lpthread.
+ * debian/iceweasel-gnome-support.install: Remove the imgicon component from
+ the iceweasel-gnome-support package. (Closes: #477661)
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in: Fix FTBFS on hppa.
+ (Closes: #473766)
+
+ -- Mike Hommey <glandium@debian.org> Sat, 26 Apr 2008 09:35:27 +0200
+
+iceweasel (3.0~b5-2) experimental; urgency=low
+
+ [ Mike Hommey ]
+ * allmakefiles.sh: Make the branding directory cleanup properly.
+ * browser/build.mk, browser/installer/Makefile.in,
+ toolkit/mozapps/installer/packager.mk: Cleanup the few remaining files in
+ browser/installer when distcleaning.
+ * configure.in, configure: Check less things during configure when using
+ libxul-sdk.
+
+ [ Eric Dorland ]
+ * debian/rules: Install the libimgicon.so component in the regular
+ iceweasel package and not iceweasel-gnome-support. It's needed to
+ display the icons and doesn't actually depend on anything gnome
+ specific. (Closes: #474728)
+ * debian/rules: Suggest xfonts-mathml and ttf-mathematica4.1 for mathml
+ support. (Closes: #445564)
+
+ -- Eric Dorland <eric@debian.org> Tue, 22 Apr 2008 01:26:06 -0400
+
+iceweasel (3.0~b5-1) experimental; urgency=low
+
+ * New upstream beta release.
+ * debian/branding/locales/Makefile.in: Fix location of the branding
+ directory.
+
+ -- Eric Dorland <eric@debian.org> Wed, 02 Apr 2008 22:58:08 -0400
+
+iceweasel (3.0~b4-2) experimental; urgency=low
+
+ * debian/branding/*, debian/rules, debian/iceweasel.install: Use the
+ --with-branding flag, create a branding directory and generate all of
+ our snazy icons inside of it.
+ * debian/filter-globe.xsl: Remove, no longer needed.
+ * debian/control: Fix build dependencies, add zip and
+ libdbus-glib-1-dev, and tighten the cairo dependency. Thanks Michel
+ Dänzer. (Closes: #472467)
+ * debian/rules: Disable the crash reporter, Mozilla probably won't
+ appreciate our reports.
+
+ -- Eric Dorland <eric@debian.org> Tue, 01 Apr 2008 01:42:10 -0400
+
+iceweasel (3.0~b4-1) experimental; urgency=low
+
+ * New upstream beta release.
+
+ * debian/control:
+ - Sort the Build-Depends by alphabetical order and add proper linebreaks.
+ - Update Standards-Version to 3.7.3.
+ - Point Vcs-* headers at new Git repo.
+ * browser/base/content/baseMenuOverlay.xul,
+ browser/base/content/baseMenuOverlay.xul,
+ browser/base/content/credits.xhtml,
+ browser/components/nsBrowserGlue.js,
+ browser/locales/en-US/chrome/overrides/appstrings.properties,
+ browser/locales/en-US/searchplugins/answers.xml,
+ browser/locales/en-US/searchplugins/google.xml: Re-port a bunch of
+ Firefox to Iceweasel renames.
+ * debian/iceweasel-dom-inspector.install,
+ debian/iceweasel-dom-inspector.links, debian/control, debian/rules:
+ The dom-inspector has been removed from 3.0, so remove the package and
+ conflict against the old one.
+
+ -- Eric Dorland <eric@debian.org> Sun, 23 Mar 2008 23:09:32 -0400
+
+iceweasel (3.0~b3-1) experimental; urgency=low
+
+ * New upstream beta release.
+ * debian/rules: Remove the --enable-chrome-format=flat for now.
+
+ -- Eric Dorland <eric@debian.org> Tue, 04 Mar 2008 01:36:37 -0500
+
+iceweasel (3.0~b2-1) UNRELEASED; urgency=low
+
+ * New upstream beta release.
+ * debian/remove.nonfree: Don't remove atk components from other-licenses.
+ * debian/rules:
+ - Don't build static, seems static building is incompatible with libxul.
+ - Need to build with internal libpng, since the system on doesn't support
+ APNG.
+ - Don't use system nss, nspr and hunspell for the moment.
+ - Don't install the nspr, nss, etc links for now.
+ - Pass --disable-install-strip and drop --disable-strip-libs, which
+ doesn't exist anymore.
+ * toolkit/library/Makefile.in: Include -lXrender, the GTK libs don't
+ seem to pull it in and we need it.
+ * debian/iceweasel.install:
+ - Apparently the unixprintplugin isn't there anymore, remove the line.
+ - Collapse the chrome installation, the manifest files there are the only
+ ones we want.
+ * debian/iceweasel.install, debian/iceweasel.links:
+ - Install and link to the new modules directory.
+ - Install and link to new .ini files.
+
+ -- Eric Dorland <eric@debian.org> Mon, 21 Jan 2008 17:56:50 -0500
+
+iceweasel (2.0.0.11-1) unstable; urgency=low
+
+ * New upstream release, not actually different from 2.0.0.10-2.
+
+ [ Eric Dorland ]
+ * debian/iceweasel.desktop: Set the Category to Network;WebBrowser and
+ remove invalid Applcation.
+ * debian/rules: Don't unilaterally ignore make distclean errors.
+
+ [ Mike Hommey ]
+ * debian/shlibs.local: Not needed now that older versions of libnss are not
+ longer in the archive.
+
+ -- Eric Dorland <eric@debian.org> Sat, 01 Dec 2007 20:40:54 -0500
+
+iceweasel (2.0.0.10-2) unstable; urgency=low
+
+ * content/canvas/src/nsCanvasRenderingContext2D.cpp: Apply patch from
+ bz#391028 to fix bz#405584, a regression in Canvas.drawImage.
+
+ -- Eric Dorland <eric@debian.org> Tue, 27 Nov 2007 13:13:56 -0500
+
+iceweasel (2.0.0.10-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fix the following security issues: CVE-2007-5960, CVE-2007-5959,
+ CVE-2007-5947. (Closes: #451624)
+
+ [ Mike Hommey ]
+ * layout/build/Makefile.in: Properly get cairo lib dependencies for arch
+ where we build with a libgklayout.so, such as mips.
+
+ [ Eric Dorland ]
+ * debian/control:
+ - Add Vcs-* headers.
+ - Use binary:Version rather than Source-Version where appropriate.
+
+ -- Eric Dorland <eric@debian.org> Tue, 27 Nov 2007 03:13:22 -0500
+
+iceweasel (2.0.0.9-2) unstable; urgency=low
+
+ * configure, configure.in, content/canvas/src/Makefile.in,
+ layout/svg/renderer/src/cairo/Makefile.in,
+ config/static-config.mk, config/autoconf.mk.in: Properly get cairo lib
+ dependencies and don't rely on GTK bringing them, which just don't
+ happen anymore (see #343711). Patch adapted from bz#344818.
+ * debian/rules: Add -l option to dh_shlibdeps call so that private libraries
+ are properly found by newest dpkg-shlibdeps. Also removed useless call to
+ dh_shlibdeps in build-indep target.
+ * debian/control: Build depend on non broken versions of dpkg-dev.
+ (Closes: #452312)
+
+ -- Mike Hommey <glandium@debian.org> Fri, 23 Nov 2007 20:40:22 +0100
+
+iceweasel (2.0.0.9-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #449195)
+
+ -- Eric Dorland <eric@debian.org> Sun, 04 Nov 2007 22:53:03 -0500
+
+iceweasel (2.0.0.8-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixes the following security issues: CVE-2007-4841, CVE-2007-5338,
+ CVE-2007-5337, CVE-2007-5334, CVE-2007-3511, CVE-2006-2894,
+ CVE-2007-2292, CVE-2007-1095, CVE-2007-5339, CVE-2007-5340.
+ (Closes: #445514, #438873)
+
+ -- Eric Dorland <eric@debian.org> Sat, 20 Oct 2007 02:04:01 -0400
+
+iceweasel (2.0.0.7-2) unstable; urgency=low
+
+ * gfx/src/gtk/gtk2drawing.c: Add patch from bz#389801 for gtk problems
+ with gtk 2.12. (Closes: #444149)
+
+ -- Eric Dorland <eric@debian.org> Thu, 27 Sep 2007 22:26:44 -0400
+
+iceweasel (2.0.0.7-1) unstable; urgency=low
+
+ * The "pointlessly following upstream" release.
+ * New upstream security release, fixes a Windows only vulnerability.
+
+ * debian/iceweasel.menu: Drop the Web Browser menu hint in the face of
+ the menu reorg. (Closes: #435106)
+ * debian/debsearch.src: Fix for new packages.debian.org, thanks Hristo
+ Hristov. (Closes: #440826)
+ * debian/wikipedia-en.xml: Update to newer Wikipedia search engine
+ plugin. (Closes: #443465)
+ * debian/iceweasel.NEWS: Remove, it is now quite outdated. (Closes: #434526)
+ * debian/control, debian/iceweasel.postinst: Add dependency on procps,
+ and check if firefox is running before printing the message about
+ restarting. (Closes: #435119)
+ * configure.in, configure: Steal asac's patch to work around visibility
+ issues in gcc 4.2. (Closes: #428282)
+
+ -- Eric Dorland <eric@debian.org> Mon, 24 Sep 2007 00:07:12 -0400
+
+iceweasel (2.0.0.6-1) unstable; urgency=high
+
+ * New security/stability upstream release (v2.0.0.6)
+ * MFSA 2007-26 aka CVE-2007-3844
+ * MFSA 2007-27 aka CVE-2007-3845
+ * debian/remove.nonfree: Also remove DLLs we don't have source for.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 01 Aug 2007 08:30:37 +0200
+
+iceweasel (2.0.0.5-2) unstable; urgency=high
+
+ * configure, configure.in: Make sure we won't be bitten by upstream
+ changing libjpeg, libpng or zlib internal version, which makes system
+ library not used even though --with-system-* argument is given to
+ configure. This time, it happened with libpng.
+ * uriloader/exthandler/unix/nsGNOMERegistry.cpp: Remove an include that
+ should have been removed earlier.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 21 Jul 2007 22:15:43 +0200
+
+iceweasel (2.0.0.5-1) unstable; urgency=high
+
+ [ Mike Hommey ]
+ * New security/stability upstream release (v2.0.0.5)
+ * MFSA 2007-18 aka CVE-2007-3734 (browser), CVE-2007-3735 (Javascript)
+ * MFSA 2007-19 aka CVE-2007-3736
+ * MFSA 2007-20 aka CVE-2007-3089
+ * MFSA 2007-21 aka CVE-2007-3737
+ * MFSA 2007-22 aka CVE-2007-3285
+ * MFSA 2007-24 aka CVE-2007-3656
+ * MFSA 2007-25 aka CVE-2007-3738
+ * config/system-headers, config/Makefile.in: Add system wrapper for
+ hunspell.hxx.
+ (Partially fixes #428282)
+
+ [ Eric Dorland ]
+ * debian/iceweasel.menu: Change section for the new menu hierarchy.
+
+ -- Mike Hommey <glandium@debian.org> Thu, 19 Jul 2007 23:30:11 +0200
+
+iceweasel (2.0.0.4-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #427785)
+ * Fixes mfsa-2007-{12-14}, mfsa-2007-{16-17}, also known as
+ CVE-2007-1362, CVE-2007-2867, CVE-2007-2868, CVE-2007-2869,
+ CVE-2007-2870, CVE-2007-2871.
+ * uriloader/exthandler/unix/nsOSHelperAppService.cpp: Revert our changes
+ that are deprecated by upstream changes.
+ * uriloader/exthandler/unix/nsGNOMERegistry.h: Adapt so that our changes
+ build correctly.
+ * debian/iceweasel.desktop: Add Swedish translation. Thanks Daniel
+ Nylander. (Closes: #420051)
+ * security/manager/ssl/src/nsCertVerificationThread.cpp,
+ security/manager/ssl/src/nsSSLThread.cpp: Avoid some cpu wake ups in
+ PSM. bz#380558
+ * modules/libpref/src/init/all.js: Set layout.css.dpi to 0 instead of -1.
+ Iceweasel will use system DPI and avoid using huge fonts on systems where
+ DPI < 96. (Closes: #409074)
+ * debian/control:
+ + Build depend on libnspr4-dev and libnss3-dev.
+ + Remove mozilla-firefox* and firefox* transition packages.
+ * debian/mozilla-firefox*, debian/firefox*: Removed.
+ * debian/rules:
+ + Use system nspr and nss.
+ + Don't shlibsign.
+ + Install symlinks for nspr and nss libraries in /usr/lib/iceweasel.
+ * shlibs.local: Force versioned dependencies on libnss because of our use
+ of the libnssckbi.so file under /usr/lib/nss which appeared in version
+ 3.11.5-1.
+ * extensions/reporter/resources/content/reporter/reporterOverlay.xul:
+ Put the "Report Broken Site" item before the about separator.
+ (Closes: #416190)
+
+ -- Mike Hommey <glandium@debian.org> Sat, 09 Jun 2007 08:26:05 +0200
+
+iceweasel (2.0.0.3-2) unstable; urgency=low
+
+ * debian/README.Debian: ICEWEASEL_DSP default is none, not auto.
+ * debian/copyright: Updated part about removed files.
+ * configure, configure.in, config/autoconf.mk.in,
+ extensions/spellchecker/myspell/src/Makefile.in,
+ extensions/spellchecker/myspell/src/mozMySpell.h: Modified to have
+ system hunspell library used instead of myspell. (Closes: #400621)
+ * debian/rules: Replaced --enable-system-myspell with
+ --enable-system-hunspell.
+ * debian/control: Don't build depend on libmyspell-dev but on correct
+ version of libhunspell-dev.
+ * configure, configure.in: Apply fix from bz#366844 to avoid bashisms and
+ do better checks.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 23 Mar 2007 20:01:19 +0100
+
+iceweasel (2.0.0.3-1) unstable; urgency=low
+
+ * New upstream release. Fixes mfsa-2007-11.
+ * Cleaned up the orig.tar.gz from non-free files.
+ * debian/remove.nonfree: Added the script used to do the clean-up for
+ documentation purpose.
+ * uriloader/exthandler/unix/nsOSHelperAppService.cpp: Make MIME registry
+ use system mime.types when it doesn't get extensions from the Gnome
+ registry. This will make the helper configuration dialogs work better.
+ * debian/control:
+ + Build Conflict on graphicsmagick-imagemagick-compat to avoid bug
+ #413954.
+ + Bumped Standards-Version to 3.7.2.2. No changes.
+ * debian/iceweasel.install: Don't install iceweasel.png in
+ /usr/share/pixmaps.
+ * debian/rules: Install several icons in the hicolor theme.
+ * debian/iceweasel.links:
+ + Change links for /usr/share/pixmaps/firefox.png and
+ /usr/share/pixmaps/mozilla-firefox.png.
+ + Link some icons in iceweasel directories into the appropriate hicolor
+ directory.
+ + Make /usr/share/pixmaps/iceweasel.png a link to the appropriate hicolor
+ icon.
+ (Closes: #414012)
+ * browser/locales/en-US/searchplugins/answers.xml,
+ browser/locales/en-US/searchplugins/google.xml: Remove firefox branding in
+ search engines. Note the output=firefox is necessary for google
+ suggestions. (Closes: #414933)
+
+ -- Mike Hommey <glandium@debian.org> Wed, 21 Mar 2007 20:29:33 +0100
+
+iceweasel (2.0.0.2+dfsg-3) unstable; urgency=low
+
+ * debian/iceweasel-runner: Fix the previous fix, so that arguments are not
+ doubled. (Closes: #413162)
+ * debian/Options.png.uu, debian/iceweasel.png.uu, debian/iceweasel48.png.uu,
+ debian/document.png.uu, debian/mozicon128.png.uu, debian/mozicon16.xpm,
+ debian/mozicon50.xpm, debian/default.xpm, debian/iceweasel.xpm: Removed.
+ * debian/iceweasel_icon.svg, debian/iceweasel_logo.svg: Added source SVG
+ files for the logo and the icon, and changed the color of the globe.
+ (Closes: #404882, #408108, #409035)
+ * debian/filter-globe.xsl: Added XSLT stylesheet to filter the globe out of
+ the icon.
+ * debian/about.png.uu, debian/aboutCredits.png.uu: Removed the logo and icon
+ from these, so that they can be used as a base to generate the final PNG
+ images, combined with the proper icon and logo.
+ * debian/control: Added build dependencies on librsvg-bin, xsltproc and
+ imagemagick to generate all appropriate images from the SVG files.
+ * debian/rules: Added rules to generate all the necessary images and clean
+ up generated images.
+ * debian/copyright: Added copyright for the svg files.
+ * debian/homepagereset.js: Custom component to reset the browser homepage
+ if it is set to the old localstart.html page from the mozilla-browser
+ package, which doesn't exist any more. (Closes: #410841)
+ * debian/iceweasel.install: Install the homepagereset component.
+ * browser/base/content/browserconfig.properties: Set home page to about:.
+ * toolkit/content/about.xhtml: Add links to about:bugs and
+ about:README.Debian to the about: page. Also remove the non-link to
+ upstream release notes.
+ * debian/about_debian.js: Custom component to add support for
+ about:README.Debian and about:bugs addresses.
+ * debian/iceweasel.install: Install the about_debian component.
+ * layout/base/nsPresContext.cpp, layout/base/nsPresContext.h: Fix for hang
+ up when switching GTK theme. bz#352096. Thanks Alexander Sack.
+ * debian/iceweasel.install, debian/iceweasel.links: Install the
+ browserconfig.properties file.
+ * debian/rules: Avoid compressing README.Debian for it to be seen in
+ about:README.Debian.
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in: Fixed test on OS_TEST so
+ that hppa stops using the unsupported stubs.
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in: Update patch for Linux
+ ppc to match those on iceape and xulrunner.
+ * xpcom/typelib/xpidl/xpidl.c: Revert useless patch: xpidl is not installed
+ anymore.
+ * configure, configure.in:
+ + Reverted remainings of an old patch for pango that was reverted in
+ 2.0+dfsg-1.
+ + Update patch for zip check to match that of xulrunner.
+ * layout/generic/nsTextTransformer.h: Avoid freeze/crash when null
+ characters are present in justified text by discarding NULL characters
+ before displaying. bz#366902 I don't like to have the two backends do
+ different things, so we just unconditionally apply the workaround. (Stolen
+ from xulrunner)
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp,
+ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp: Better patch
+ for m68k, from Modified by Roman Zippel. (Stolen from xulrunner)
+ * modules/libjar/nsJAR.h, modules/libjar/nsJAR.cpp: Invalidate cache for a
+ zip file that got modified. It will prevent corruption of the XUL FastLoad
+ cache when upgrade is performed while an instance of the application is
+ running. bz#368428. (Stolen from iceape and xulrunner)
+ * browser/base/content/baseMenuOverlay.xul: Removed "Release Notes" and
+ "Check for Updates" menu items from the Help menu. (Closes: #407508)
+ * debian/control: Added build dependencies on autotools-dev.
+ * debian/rules: Added rules to update config.guess and config.rules at
+ configure time, and remove the changes at clean time.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 4 Mar 2007 22:29:59 +0100
+
+iceweasel (2.0.0.2+dfsg-2) unstable; urgency=low
+
+ [ Mike Hommey ]
+ * debian/iceweasel-runner: Use of a dummy argument is useless now set -- is
+ being used. Plus, it avoids an ill side effect of now using set --.
+ (Closes: #412344, #412404, #412418, #412585, #412711, #412746, #412876)
+
+ [ Eric Dorland ]
+ * debian/iceweasel-runner:
+ - Patch from Sam Pennyto fix firefox reference. Clean up wording a
+ bit too. (Closes: #412475)
+ - Don't lose $prev in some cases. Thanks Loic Grenie.
+
+ -- Eric Dorland <eric@debian.org> Fri, 2 Mar 2007 03:36:58 -0500
+
+iceweasel (2.0.0.2+dfsg-1) unstable; urgency=high
+
+ * New upstream release. Fixes security vulnerabilities: CVE-2007-0775,
+ CVE-2007-0776, CVE-2007-0777, CVE-2007-0995, CVE-2006-6077,
+ CVE-2007-0778, CVE-2007-0779, CVE-2007-0780, CVE-2007-0800,
+ CVE-2007-0008, CVE-2007-0009, CVE-2007-0981.
+ * browser/app/firefox-branding.js: Set app.releaseNotesURL to the
+ correct url for release notes. (Closes: #411226)
+ * debian/iceweasel-runner: Use set -- everywhere. Thanks Loic Grenie.
+
+ -- Eric Dorland <eric@debian.org> Sun, 25 Feb 2007 06:08:04 -0500
+
+iceweasel (2.0.0.1+dfsg-4) unstable; urgency=low
+
+ * debian/iceweasel.menu: Add a longtitle.
+ * browser/app/nsBrowserApp.cpp, toolkit/xre/nsXULAppAPI.h,
+ toolkit/xre/nsAppRunner.cpp: Add a new displayName field and set it to
+ "Iceweasel". Use it in a number of places instead of name for
+ display. (Closes: #411493)
+
+ -- Eric Dorland <eric@debian.org> Tue, 20 Feb 2007 18:33:58 -0500
+
+iceweasel (2.0.0.1+dfsg-3) unstable; urgency=high
+
+ * debian/README.Debian: Fix typo, thanks Joey "I See All!"
+ Hess. (Closes: #407366)
+ * debian/presubj: Fix embarrassing typos and wording. Thanks Ross
+ Boylan. (Closes: #407726)
+ * debian/iceweasel.1: Mention "aoss" as a dsp wrapper, and fix esd and
+ arts references. Thanks Alain Kalker. (Closes: #407662)
+ * intl/unicharutil/util/nsUnicharUtils.h: Patch from David
+ Mosberger-Tang to fix unaligned access on ia64.
+ * browser/app/nsBrowserApp.cpp: Fix another Firefox reference. Thanks
+ Ben Stewart (Closes: #408883)
+ * browser/app/firefox-branding.js: Set startup.homepage_override_url and
+ startup.homepage_welcome_url to "" to really disable the upgrade page
+ overrides. (Closes: #407533)
+ * debian/control: Call iceweasel-gnome-support a component rather than an
+ extension. Thanks Axel Beckert. (Closes: #409950)
+ * gfx/src/gtk/nsFontMetricsPango.cpp: Patch from bz#335810 to preserve
+ horizontal position in text input fields. (Closes: #409634, 406612)
+ * netwerk/base/src/nsSimpleURI.cpp, netwerk/base/src/nsStandardURL.cpp,
+ netwerk/base/src/nsURLHelper.cpp: Fix for security bug CVE-2007-0981
+ from bz#370445. (Closes: #411192)
+
+ -- Eric Dorland <eric@debian.org> Sun, 18 Feb 2007 20:56:27 -0500
+
+iceweasel (2.0.0.1+dfsg-2) unstable; urgency=high
+
+ [ Eric Dorland ]
+ * debian/rules: Use chmod a-x instead of just -x. (Closes: #404548)
+ * browser/locales/en-US/chrome/browser/credits.dtd,
+ browser/base/content/credits.xhtml: Remove trademark symbol and fix
+ the motto. (Closes: #404945)
+ * debian/control: Remove recommends added into the previous version,
+ libmyspell already has them.
+ * security/nss/lib/freebl/unix_rand.c: #undef DO_NETSTAT instead of just
+ setting it to 0, to really stop it from running netstat. (Closes:
+ #405531)
+ * browser/base/content/browserconfig.properties: Change the default
+ start homepage to http://www.debian.org/.
+ * browser/app/firefox-branding.js: Set
+ "browser.startup.homepage_override.mstone" to "ignore" to prevent
+ annoying Firefox branded firstrun and upgrade pages. (Closes: #404649)
+ * debian/README.Debian: Document why we're now called
+ Iceweasel. (Closes: #399814)
+ * debian/copyright: Indicate that the debian directory is licensed like
+ firefox, under the GPL/LGPL/MPL. (Closes: #406846)
+
+ [ Mike Hommey ]
+ * debian/iceweasel-runner: Removed bashisms.
+ * debian/README.Debian: Updated information about ICEWEASEL_DSP setting and
+ java plugin. Also replaced Firefox by Iceweasel where appropriate.
+ * debian/iceweasel.links: Removed /usr/{lib|share}/firefox links.
+ (Closes: #404733)
+
+ -- Eric Dorland <eric@debian.org> Tue, 16 Jan 2007 00:02:34 -0500
+
+iceweasel (2.0.0.1+dfsg-1) unstable; urgency=high
+
+ [ Eric Dorland ]
+ * New upstream release. Fixes mfsa-2006-{68-73,74,75} also known as
+ CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, CVE-2006-6500,
+ CVE-2006-6501, CVE-2006-6502, CVE-2006-6503, CVE-2006-6504,
+ CVE-2006-6506, CVE-2006-6507.
+ * directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt,
+ netwerk/protocol/ftp/doc/rfc959.txt: Removed from the orig.tar.gz
+ because of freeness issues. (Closes: #400339, #393370)
+ * debian/copyright: Update to list the files removed from the upstream
+ tarball.
+
+ * browser/locales/en-US/updater/updater.ini,
+ browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in,
+ browser/locales/en-US/chrome/overrides/appstrings.properties,
+ browser/components/nsBrowserGlue.js,
+ toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties:
+ Rename Firefox to Iceweasel. (Closes: #399656, #400721)
+ * browser/locales/en-US/chrome/browser/aboutDialog.dtd,
+ browser/base/content/credits.xhtml: Remove references to Firefox
+ trademarks.
+ * debian/wikipedia-en.xml, debian/wikipedia.gif.uu,
+ debian/wikipedia.src, debian/iceweasel.install, debian/rules: Add new
+ style Wikipedia search plugin and remove old one.
+ * debian/presubj: Fix references to Firefox. (Closes: #399817)
+ * debian/control:
+ - Clearify relationship to Firefox in the Iceweasel description.
+ (Closes: #399678)
+ - Add Recommends on some myspell dictionaries. (Closes: #400622)
+ * debian/iceweasel-dom-inspector.links: Fix mistaken link to
+ /usr/lib/firefox. (Closes: #399631)
+ * browser/locales/en-US/chrome/browser/preferences/advanced.dtd: Fix
+ accelerator key for "Iceweasel". (Closes: #400308)
+ * debian/iceweasel.1:
+ - Fix some incorrect references to Firefox. Thanks Chris Neugebauer.
+ (Closes: #400708)
+ - ICEWEASEL_DSP default is none, not auto. Thanks Rafal Rutkowski.
+ * debian/debsearch.png.uu, debian/debsearch.gif.uu,
+ debian/iceweasel.install, debian/rules: Install a .png version of the
+ debsearch logo, with better transparency. Thanks Daniel Hess. (Closes:
+ #400248)
+ * debian/iceweasel-runner: Fix ICEWEASEL_DSP set from the
+ environment. Thanks Rafal Rutkowski. (Closes: #404356)
+
+ [ Mike Hommey ]
+ * debian/watch: Updated for non experimental versions.
+ * browser/base/branding/searchconfig.properties: Replaced firefox with
+ iceweasel.
+ * debian/firefox.prerm, debian/firefox.postinst: Removed. (Closes: #402407)
+ * debian/firefox/preinst: Remove old generated files from firefox.
+ * debian/iceweasel-gnome-support.postinst, debian/iceweasel.prerm,
+ debian/iceweasel-gnome-support.prerm: Replaced firefox by iceweasel.
+ * configure, configure.in: Fix OS_TARGET so that it is correctly set
+ to Linux for things that expect this value instead of linux-gnu, such as
+ the extensions manager (Closes: #401987)
+ * debian/iceweasel.preinst: Applied patch from Peter Green to fix some
+ issues with upgrades where doesn't /etc/firefox contain firefox's config
+ files for some reason (Closes: #399670). Also replace FIREFOX with
+ ICEWEASEL in /etc/iceweasel/iceweaselrc.
+
+ [ Alexander Sack ]
+ * debian/default.xpm, debian/mozicon16.xpm, debian/mozicon50.xpm,
+ debian/iceweasel.png.uu, debian/about.png.uu, debian/mozicon128.png.uu,
+ debian/document.png.uu, debian/iceweasel48.png.uu, debian/Options.png.uu
+ debian/aboutCredits.png.uu: Added unicko iceweasel artwork.
+ * debian/iceweasel.install: installing appropriate artwork files from
+ above to /usr/share/iceweasel/chrome/icons/default and
+ /usr/share/iceweasel/icons/.
+ * debian/rules: uudecoding artwork files from above. Installing appropriate
+ files in build tree in 'build-stamp' and cleaning them up in 'clean'
+
+ -- Eric Dorland <eric@debian.org> Mon, 25 Dec 2006 15:30:04 -0500
+
+iceweasel (2.0+dfsg-1) unstable; urgency=low
+
+ * New upstream release. This release dedicated to Mike Connor.
+
+ [ Eric Dorland ]
+ * Too many renames of firefox to iceweasel to count.
+ * debian/iceweasel.desktop: Remove duplicate pt_BR entries and replace
+ Firefox with Iceweasel.
+ * debian/iceweaselrc: Rename FIREFOX_DSP to ICEWEASEL_DSP.
+ * configure.in: MOZ_APP_DISPLAYNAME=Iceweasel.
+ * config/autoconf.mk.in: Set mozappdir to /usr/lib/iceweasel.
+ * debian/iceweasel.preinst: Copy /etc/firefox into /etc/iceweasel
+ * modules/libpref/src/init/all.js: Use iceweasel.cfg instead of
+ firefox.cfg.
+ * iceweasel.png.uu: Generate iceweasel.png, not firefox.png.
+ * browser/locales/en-US/chrome/branding/brand.properties,
+ browser/locales/en-US/chrome/branding/brand.dtd: Switch Bon Echo to
+ Iceweasel.
+
+ [ Mike Hommey ]
+ * gfx/src/gtk/mozilla-decoder.cpp, config/autoconf.mk.in: Revert changes
+ for pangocairo support, since we solved the build problem by correctly
+ detecting pangoxft instead.
+ * debian/control: Suggest libkrb53 for kerberos authentication.
+ * modules/libpr0n/build/Makefile.in: Add empty line at the end to avoid
+ useless change to show up in the diff.
+ * security/nss/lib/freebl/unix_rand.c: Stole patch from Ubuntu that adapted
+ the previous changes to the new version of the upstream file.
+ * modules/libpref/src/init/all.js: Stole patch from Ubuntu that changes some
+ default fonts from serif to sans-serif.
+ * debian/rules:
+ + Set distribution id to 'org.debian'.
+ + Force the build to have a "correct" build ID.
+ * browser/components/feeds/src/FeedWriter.js: Patch from bz#343360 to make
+ feed subscription and preview work properly. (Closes: #387639)
+
+ -- Eric Dorland <eric@debian.org> Mon, 13 Nov 2006 23:18:40 -0500
+
+firefox (2.0~rc1+dfsg-1) experimental; urgency=low
+
+ [ Eric Dorland ]
+ * New upstream release candidate release.
+
+ [ Mike Hommey ]
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in: Revert patch from version
+ 1.5.0.6-5, the problem was configure.in changes not applied in configure,
+ which was already done on this branch anyways.
+ Adapted to not build the ppc_linux code for ppc64, though.
+ * debian/watch: Updated watch file for new version scheme.
+ * config/make-jars.pl: Applied patch from bz#336056 to allow ~ in the
+ destination directory (which is required since we now have a ~ in the
+ main firefox directory name).
+ * gfx/src/ps/nsFontMetricsPS.cpp: Applied patch from Alexander Sack to fix
+ crashes while printing. (Closes: #389724)
+
+ -- Mike Hommey <glandium@debian.org> Sat, 7 Oct 2006 09:23:12 +0200
+
+firefox (1.5.dfsg+1.5.0.7-1) unstable; urgency=high
+
+ * New upstream release. Urgency high because it fixes security issues.
+ * editor/libeditor/text/nsPlaintextEditor.cpp: Quite likely reverted the
+ OverTheSpot patch, did not feel confident reapplying it with the
+ upstream changes in this file. Please submit an updated patch to get
+ it back.
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in: Slightly puzzling patch
+ from Andreas Jochens to make firefox compile on ppc64 again. (Closes:
+ #387423)
+
+ -- Eric Dorland <eric@debian.org> Mon, 18 Sep 2006 01:55:57 -0400
+
+firefox (1.5.dfsg+1.5.0.6-5) unstable; urgency=high
+
+ * Severity high because we fix an RC bug.
+ * debian/control: Adjust mozilla-firefox-dom-inspector for binNMU safety
+ as well.
+ * debian/firefox.desktop: Patch from Yavor Doganov to add a Bulgarian
+ translation. (Closes: #386988)
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in: Fix slight mistake in
+ Mike's previous patch that misrecognized ppc arches. Thanks Markus for
+ the patch. (Closes: #386367)
+
+ -- Eric Dorland <eric@debian.org> Wed, 13 Sep 2006 01:45:20 -0400
+
+firefox (1.5.dfsg+1.5.0.6-4) unstable; urgency=high
+
+ [ Eric Dorland ]
+ * Urgency still high, as we're still trying to get into testing.
+ * debian/firefox.desktop: Patch from Nick Niktaris with Greek
+ translation. (Closes: #384678)
+ * debian/control: Add Suggests on mozplugger. (Closes: #384382)
+
+ [ Mike Hommey ]
+ * debian/control: Adjust dependencies for binNMU safety.
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in, configure.in, configure:
+ Use ${host_cpu} instead of uname -m so that firefox can safely build on
+ s390x with a s390 target, and on amd64 with an x86 target.
+ * uriloader/exthandler/unix/nsGNOMERegistry.cpp,
+ uriloader/exthandler/unix/nsGNOMERegistry.h,
+ uriloader/exthandler/unix/nsOSHelperAppService.cpp,
+ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp,
+ uriloader/exthandler/unix/nsMIMEInfoUnix.h: Adapted patch from bz#273524 to
+ make helper applications with parameters work. (Closes: #355511)
+ * debian/watch: Updated.
+
+ -- Eric Dorland <eric@debian.org> Mon, 4 Sep 2006 23:25:44 -0400
+
+firefox (1.99+2.0b2+dfsg-1) experimental; urgency=low
+
+ * New upstream beta release.
+
+ * extensions/inspector/build/src/Makefile.in,
+ extensions/inspector/build/src/inspector.pkg,
+ extensions/inspector/build/src/nsInspectorModule.cpp: Removed, the problem
+ was lying in debian/rules. /me goes hiding under a rock.
+ * layout/inspector/public/Makefile.in: Reverted previous changes.
+ * debian/rules: Don't exclude inspector files when dh_installing the firefox
+ package. We need the inspector.xpt file from the components directory. The
+ files for the dom-inspector package are already excluded from the
+ firefox.install file anyway.
+ * debian/firefox-dom-inspector.install,
+ debian/firefox-dom-inspector.links: Simplified.
+ * debian/control:
+ + Turn firefox-dom-inspector into an arch: all package, since the binary
+ component has been merged into the firefox binary.
+ + Adjust dependencies for binNMU safety.
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in, configure.in, configure:
+ Use ${host_cpu} instead of uname -m so that firefox can safely build on
+ s390x with a s390 target, and on amd64 with an x86 target.
+ * uriloader/exthandler/unix/nsGNOMERegistry.cpp,
+ uriloader/exthandler/unix/nsGNOMERegistry.h,
+ uriloader/exthandler/unix/nsOSHelperAppService.cpp,
+ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp,
+ uriloader/exthandler/unix/nsMIMEInfoUnix.h: Adapted patch from bz#273524 to
+ make helper applications with parameters work. (Closes: #355511)
+ * debian/copyright: Adjusted with updated information for firefox 2.0, which
+ is now properly tri-licensed \o/. (Closes: #330295)
+ * debian/rules: Install the MPL file taken from the upstream LICENSE file.
+ * debian/watch: Updated.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 1 Sep 2006 08:36:26 +0200
+
+firefox (1.5.dfsg+1.5.0.6-3) unstable; urgency=low
+
+ * browser/app/Makefile.in: Workaround to force link the xpcom library to
+ the firefox binary despite -Wl,--as-needed in the LDFLAGS.
+ (Closes: #378667)
+ * debian/firefox.install: Don't install xpt_link, xpt_dump, xpidl,
+ xpicleanup, xpcshell nor regxpcom. They are of no use to firefox users and
+ are provided with xulrunner anyway. (Closes: #362190)
+
+ -- Mike Hommey <glandium@debian.org> Sun, 20 Aug 2006 19:49:25 +0200
+
+firefox (1.5.dfsg+1.5.0.6-2) unstable; urgency=low
+
+ * debian/firefox.desktop:
+ - Polish translation from Ian Jackson by way of an Ubuntu user.
+ (Closes: #382079)
+ - Patch from Ian Jackson to stop claiming dav:// URLs when firefox
+ doesn't understand them. (Closes: #382080)
+ * editor/libeditor/text/nsPlaintextEditor.cpp: Apply patch from
+ bz#271815 to fix OverTheSpot mode used by many Asian language input
+ modules. (Closes: #379935)
+
+ -- Eric Dorland <eric@debian.org> Tue, 15 Aug 2006 00:09:55 -0400
+
+firefox (1.5.dfsg+1.5.0.6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Eric Dorland <eric@debian.org> Thu, 3 Aug 2006 13:17:45 -0400
+
+firefox (1.5.dfsg+1.5.0.5-1) unstable; urgency=high
+
+ [ Eric Dorland ]
+ * New upstream release. Urgency high because it fixes MFSA 2006-44 to
+ MFSA 2006-56 excluiding MFSA-2006-49. (Closes: #380463)
+
+ [ Mike Hommey ]
+ * debian/firefox.prerm: Remove /usr/lib/firefox/.autoreg instead of
+ /var/lib/firefox/.autoreg.
+ * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in:
+ Removed very old and now useless changes.
+ * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp: Removed
+ useless new line that showed up in the diff.gz.
+
+ -- Eric Dorland <eric@debian.org> Sun, 30 Jul 2006 17:08:38 -0400
+
+firefox (1.99+2.0b1+dfsg-1) experimental; urgency=low
+
+ * New upstream beta targetted at experimental:
+ - Much better search plugins handling. They can be added and removed at
+ will, and even better, system-wise search plugins can be ignored at the
+ profile level. (Closes: #352195, #320957, #296425, #308005)
+ * browser/components/shell/src/Makefile.in: Correctly install the
+ setDefaultBrowser component.
+ * config/rules.mk: Don't install extensions in the chrome.
+ * debian/firefox.links: Link /usr/lib/firefox/dictionaries to
+ /usr/share/myspell/dicts.
+ * config/autoconf.mk.in, configure, configure.in: Add the
+ --enable-system-myspell argument to configure to use the system myspell
+ library.
+ * extensions/spellcheck/myspell/src/Makefile.in: Use the system myspell
+ library when asked to.
+ * debian/rules:
+ - Add --enable-system-myspell to configure call.
+ - Do shlibsign libfreebl's (there can be several depending on the arch).
+ * debian/control: Add libmyspell-dev to build dependencies.
+ * browser/components/microsummaries/src/Makefile.in, config/Makefile.in:
+ Add rules so that make clean cleans everything.
+ * allmakefiles.sh: Removed references to nonexisting Makefiles in
+ extensions/xmlextras/base.
+ * configure, configure.in: Apply patches from bz#334866, bz#319012 and
+ bz#335949 + fixups to workaround gcc visibility hidden bugs, especially
+ #331460 (an instance of which is actually still present in C++,
+ see gcc#26905).
+ * extensions/inspector/build/src/Makefile.in,
+ extensions/inspector/build/src/inspector.pkg,
+ extensions/inspector/build/src/nsInspectorModule.cpp: Added missing files
+ for the DOM Inspector component.
+ * extensions/inspector/build/src/Makefile.in,
+ layout/inspector/public/Makefile.in: Adapted so that the DOM Inspector
+ component would build correctly and the xpt would be installed in
+ the extensions directory.
+ * extensions/reporter/Makefile.in: Install missing reporter's preference.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 21 Jul 2006 07:05:25 +0200
+
+firefox (1.5.dfsg+1.5.0.4-3) unstable; urgency=low
+
+ [ Eric Dorland ]
+ * debian/control:
+ - Fix silly typo of binutils. (Closes: #378582)
+ - Standards-Version to 3.7.2.1.
+
+ [ Mike Hommey ]
+ * debian/rules:
+ - Use a specific LD_LIBRARY_PATH at link time so that we don't need to
+ link against indirect dependencies. (Closes: #378378)
+ - Run shlibsign after the files are stripped so that it is accurate and
+ FIPS mode can correctly work.
+ - Removed old commented out OPTFLAGS that were kept in case gcc 4.0 did
+ no better than gcc 3.x.
+ - Removed old exported variables that are useless nowadays.
+ - Removed dh_strip call in binary-indep. Who wants to strip
+ arch-independant files ;)
+ * debian/presubj: Added notes about plugins and crash reports.
+ * security/manager/Makefile.in, security/nss/cmd/shlibsign/Makefile:
+ Don't build nor install the .chk files but still build shlibsign.
+ * debian/firefox.install: Don't install .chk files since we generate them
+ after dh_strip.
+ * security/nss/cmd/shlibsign/manifest.mn: Don't build in shlibsign/mangle.
+ It doesn't build anyway.
+
+ -- Eric Dorland <eric@debian.org> Wed, 19 Jul 2006 23:56:22 -0400
+
+firefox (1.5.dfsg+1.5.0.4-2) unstable; urgency=low
+
+ [ Eric Dorland ]
+ * netwerk/base/public/security-prefs.js: Disable SSLv2 by default. I
+ thought the weak cipher warning took care of this. (Closes: #371153)
+ * debian/firefox-runner: Simplify the dsp autodetection and add aoss to
+ the roster. (Closes: #372848)
+ * firefox-restart-required.update-notifier, firefox.postinst,
+ firefox.install: Add update-notifier to indicate that firefox needs to
+ be restarted on upgrade. Based on Ian Jackson's patch, but reworked a
+ little. Also with a bad French translation. Translators, assemble!
+ (Closes: #365865)
+ * config/rules.mk, debian/control: Apply patch from Thiemo Seufer to
+ remove mips -xgot hack and build depend on the appropriate binutils on
+ mips and mipsel. (Closes: #374372)
+ * debian/presubj, debian/README.Debian: Add a bit more information about
+ disabling Pango, which often seems to be the source of problems.
+ * debian/firefox-runner:
+ - Print out MOZ_NO_REMOTE in verbose mode.
+ - Fix some unreachable logic, Thanks Daniel Jacobowitz.
+
+ [ Mike Hommey ]
+ * debian/rules:
+ - Fix for Gecko date extraction from client.mk.
+ - Disabled strict aliasing from optimized builds.
+ - Added -Wl,--as-needed to the LDFLAGS, so that we don't get indirect
+ libraries linked.
+ * config/static-config.mk: Add MOZ_XFT_LIBS to STATIC_EXTRA_LIBS. It used to
+ get linked as a side effect of linking to indirect libraries, but should
+ be linked directly since Xft symbols are used.
+ * debian/firefox-restart-required.update-notifier: Fixed the french
+ translation. ;)
+ * content/html/content/src/nsGenericHTMLElement.cpp,
+ content/html/content/src/nsHTMLInputElement.cpp,
+ dom/src/base/nsGlobalWindow.cpp: Fixed crasher and potential crashers.
+ Reported bz#343953.
+
+ -- Eric Dorland <eric@debian.org> Sun, 9 Jul 2006 02:37:28 -0400
+
+firefox (1.5.dfsg+1.5.0.4-1) unstable; urgency=low
+
+ * The "Post-DebConf Hangover" release.
+
+ [ Eric Dorland ]
+ * New upstream release. Fixes various security issues. MFSA 2006-31 to
+ MFSA 2006-43, excluding MFSA 2006-40.
+ * debian/control:
+ - Standards-Version to 3.7.2.0.
+ - Set priority of -dbg to extra and Section to devel.
+ * gfx/src/gtk/nsFontMetricsPango.cpp,
+ intl/lwbrk/src/nsJISx4501LineBreaker.cpp,
+ intl/unicharutil/util/nsUnicharUtils.h,
+ intl/unicharutil/util/nsUnicharUtils.cpp,
+ layout/generic/nsTextFrame.cpp: Patch from Jurij Smakov (from
+ bz#161826) to fix alignment issues on sparc64. (Closes: #354725)
+
+ [ Mike Hommey ]
+ * Applied distclean patch from xulrunner (in
+ debian/patches/01_distclean.dpatch), except for the javaxpcom stuff we
+ don't build anyway.
+ * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd},
+ config/static-rules.mk: More cleaning for firefox.
+ * nsprpub/configure: Apply change to nsprpub/configure.in.
+ (Closes: #350616)
+ * gfx/src/gtk/nsFontMetricsPango.cpp: Some more changes so that it
+ actually builds without errors, and use PR_Malloc and PR_Free instead
+ of malloc and free.
+
+ -- Eric Dorland <eric@debian.org> Fri, 2 Jun 2006 12:13:18 -0400
+
+firefox (1.5.dfsg+1.5.0.3-2) unstable; urgency=low
+
+ * debian/firefox.desktop: Add spanish translation, just in time for
+ DebConf 6! Thanks Ian Jackson. (Closes: #365870)
+ * debian/firefox-runner: Actually apply the patch from Morita Sho in
+ #364566. I'm a moron. (Closes: #365956, #365960)
+ * debian/control: Standards-Version to 3.7.1.0. Go policy team!
+
+ -- Eric Dorland <eric@debian.org> Thu, 4 May 2006 01:38:18 -0400
+
+firefox (1.5.dfsg+1.5.0.3-1) unstable; urgency=critical
+
+ * The "secure enough for ya!" release.
+ * New upstream release. Contains security fixes, hence severity
+ critical.
+ - Fixes CVE-2006-1993 aka MFSA 2006-30. (Closes: #364810)
+
+ [ Mike Hommey ]
+ * security/manager/Makefile.in, debian/firefox.install: Build and
+ install the .chk file again. That will make the FIPS mode work again.
+ * debian/control: Bumped Standards-Version to 3.7.0.0. No changes.
+ * debian/rules: Fix the navigator.ProductSub value for dumb scripts.
+ Closes: #364640, #365099. We now use the date of the client.mk file,
+ which is likely to be the closest value to the release date, instead of
+ useless build date.
+ Add the debian version after the firefox version string.
+ * debian/rules: Use dpkg-architecture to find out the host and build that
+ we want to pass to the configure script. (Closes: #365738)
+
+ [ Eric Dorland ]
+ * debian/firefox-runner:
+ - Quote the APPLICATION_ID variable to handle profiles with a space
+ in the name. Inspired by Morita Sho's patch. (Closes: #364566)
+ - echo MOZ_DISABLE_PANGO on verbose.
+ * debian/rules: It's baaaackkk. Reenable xprint.
+
+ -- Eric Dorland <eric@debian.org> Wed, 3 May 2006 00:32:49 -0400
+
+firefox (1.5.dfsg+1.5.0.2-3) unstable; urgency=low
+
+ * debian/rules, debian/control: Build the -dbg package again.
+ * debian/firefox.1: Fix some incorrect references to mozilla. Thanks
+ Loïc Minier. (Closes: #364101)
+ * debian/firefox-runner: Patch from Mikhail Gusarov to be able to use
+ Network Audio Server's dsp wrapper. (Closes: #363124)
+ * debian/firefox.install: Fix screwed up path to firefox.xpm. (Closes:
+ #364359)
+ * debian/README.Debian: Document that firefox doesn't allow connections
+ on certain ports. Thanks W. Borgert. (Closes: #362785)
+
+ -- Eric Dorland <eric@debian.org> Sun, 23 Apr 2006 22:41:15 -0400
+
+firefox (1.5.dfsg+1.5.0.2-2) unstable; urgency=critical
+
+ * The "ftp-master's aren't my friends today" release.
+ * debian/rules, debian/control: Don't build the -dbg package for now, to
+ get around NEW queue processing.
+
+ -- Eric Dorland <eric@debian.org> Thu, 20 Apr 2006 22:33:18 -0400
+
+firefox (1.5.dfsg+1.5.0.2-1) unstable; urgency=critical
+
+ [ Eric Dorland ]
+ * New upstream release. Contains security fixes, hence severity
+ critical.
+ - Fixes the following vulnerabilites (Thanks Alexander Sack for
+ compiling the list): CVE-2006-1724, CVE-2006-0884,
+ CVE-2006-1730, CVE-2006-1729, CVE-2006-1728, CVE-2006-1727,
+ CVE-2006-1045, CVE-2006-0748, CVE-2006-1726, CVE-2006-1725,
+ CVE-2005-2353. (Closes: #362656)
+ * debian/firefox-runner: Patch from Paul Collins to fix some lingering
+ ProfileManager launch issues. (Closes: #356250)
+ * browser/components/preferences/privacy.xul,
+ browser/locales/en-US/chrome/browser/preferences/preferences.dtd:
+ Patch from Ian Jackson to make the preferences window bigger for
+ people with high rez displays. His changelog entry reads:
+ * Make Preferences window not chop off various elements:
+ - specify a width of 50em instead of 42em
+ - do not specify a height
+ - add another <separator/> to the bottom of privacy.xul's prefpane.
+ I have no idea why this is necessary :-(.
+ Malone 36985.
+ * configure.in, configure: Small typo in configure.in that wasn't
+ setting TARGET_XPCOM_ABI properly and breaking binary extensions on
+ some arches. (Closes: #359228)
+
+ [ Mike Hommey ]
+ * debian/rules: Disable elf-dynstr-gc, which is pretty useless nowadays.
+ * security/coreconf/rules.mk: Fix perl code that got broken by newer make.
+ Taken from bz#325148.
+ * browser/app/Makefile.in: Apply patch from bz#314927 to install default.xpm
+ in the correct place.
+ * debian/rules, debian/firefox.dirs, debian/firefox.install: Updated to fit
+ this change.
+ * security/coreconf/rules.mk: Force use of the -g flag in the CFLAGS.
+
+ -- Eric Dorland <eric@debian.org> Sun, 16 Apr 2006 18:40:02 -0400
+
+firefox (1.5.dfsg+1.5.0.1-5) unstable; urgency=low
+
+ [ Mike Hommey ]
+ * debian/rules:
+ - Add -g to the build flags when building with DEB_BUILD_OPTIONS=nostrip.
+ If we ask for nostrip, we want the debugging
+ symbols, right? ;)
+ - Changed the way we identificate ourselves in vendor.js.
+ * layout/build/Makefile.in, layout/build/nsLayoutModule.cpp: Remove useless
+ useragent setter at startup so that general.useragent.product and
+ general.useragent.productSub set in our vendor.js preference file work at
+ startup time.
+ * security/coreconf/Linux.mk:
+ - Patch from Martin Michlmayr for mips64 builds.
+ - Don't use x86 as CPU_ARCH when building on an unsupported architecture.
+ * security/manager/Makefile.in, security/nss/lib/ckfw/builtins/Makefile,
+ security/nss/lib/manifest.mn: Don't build the stuff we don't need, and
+ dynamically link libnssckbi to both libplc4 and libplds4 instead of
+ linking statically.
+ * debian/firefox.postinst, debian/firefox.prerm,
+ debian/firefox-gnome-support.postinst, debian/firefox-gnome-support.prerm:
+ Touch a .autoreg file at configure time, or removal of gnome-support and
+ remove it with the package. This will trigger autoregistration of the
+ components if the compreg.dat and xpti.dat files are older than the
+ .autoreg file. We used to remove compatibility.ini for that reason, but
+ stopped doing that because firefox was supposed to do that correctly,
+ which actually only correctly works on new upstream versions, not new
+ debian revisions, or installation of gnome-support.
+ * xpfe/components/killAll/Makefile.in: Correctly install the killAll
+ component.
+
+ [ Eric Dorland ]
+ * debian/control:
+ - Set Section of firefox-gnome-support and
+ mozilla-firefox-gnome-support to gnome.
+ - Standards-Version to 3.6.2.2.
+ - debhelper build-dep to >= 5.0.
+ - Add firefox-dbg package.
+ * debian/compat: Set to 5.
+ * debian/rules:
+ - Remove silly CVS tarball cleanup target.
+ - Add arch-independant debhelper calls, and make other debhelper
+ calls arch-dependent.
+ - Add --dbg-package=firefox-dbg to dh_strip call.
+ - Always build with the -g flag. (Based on a change Mike made)
+ - Patch from Andreas Jochens to use -mminimal-toc when building on
+ ppc64. (Closes: #361035)
+ - Use --disable-strip, --disable-strip-libs in configure parameters.
+ Thanks Ian Jackson.
+ - Use .upstream instead of .orig to make it more clear and not
+ confuse the clean target. Thanks Ian Jackson. (Closes: #362186)
+ - Disable xprint support for now, while the Xorg 7 transition sorts
+ itself out. Should be reenabled next release.
+ * debian/firefox.xpm: Add more Debian compliant menu icon.
+ * debian/firefox.install, debian/rules: Install new Debian compliant
+ icon.
+ * debian/firefox.desktop: Add StartupNotify=true for pretty waiting
+ cursor. Thanks Sven Arvidsson. (Closes: #361527)
+ * debian/firefox-dom-inspector.preinst,
+ debian/firefox-dom-inspector.links,
+ debian/firefox-dom-inspector.install: Install non-architecture
+ specific bits of the inspector into /usr/share/firefox.
+ * debian/firefoxrc: Disable the dsp wrapper by default. esddsp is just
+ too buggy to allow this to continue. May reenable later if they clean
+ up their act. Leaving the bugs open for now.
+ * debian/firefox.NEWS:
+ - Document the dsp wrapper changes.
+ - Remove old mozilla-firefox entries.
+ * debian/firefox.1: Fix typo of firefox, thanks Andrew Rendle. (Closes:
+ #362413)
+ * debian/firefox.install: We don't get .chk files anymore for some
+ reason.
+
+ -- Eric Dorland <eric@debian.org> Fri, 14 Apr 2006 15:52:41 -0400
+
+firefox (1.5.dfsg+1.5.0.1-4) unstable; urgency=low
+
+ [ Mike Hommey ]
+ * debian/firefox-runner, debian/firefox.1: Patch from Ian Jackson to
+ make -P, -CreateProfile and -ProfileManager options correctly work
+ again, and improve the manual page. (Closes: #356250)
+ * debian/firefox.desktop:
+ - Fix trivial syntax problems. (Closes: #356263)
+ - Added Japanese and Korean translations.
+ * debian/firefox.dirs: Removed remainings of the time when we had a file
+ in /usr/sbin. (Closes: #356268)
+ * debian/firefox-gnome-support.prerm,
+ debian/firefox-gnome-support.postinst: Removed bashisms. (Closes:
+ #349946)
+ * debian/README.Debian:
+ - Replaced the bug reporting information by an invitation to read
+ /usr/share/bug/firefox/presubj. (Closes: #356269)
+ - Changed the heading to "Firefox for Debian".
+
+ [ Eric Dorland ]
+ * debian/firefox-gnome-support.postinst,
+ debian/firefox-gnome-support.prerm: Add forgotten #DEBHELPER# token.
+
+ -- Eric Dorland <eric@debian.org> Sun, 12 Mar 2006 21:34:14 -0500
+
+firefox (1.5.dfsg+1.5.0.1-3) unstable; urgency=low
+
+ [ Eric Dorland ]
+ * debian/control: Use strict dependencies for the transition packages,
+ no reason a transition package should be upgraded before the real
+ package.
+ * debian/README.Debian: Fix all references to
+ /etc/mozilla-firefox/mozilla-firefoxrc. (Closes: #351956)
+ * debian/firefox.desktop: Patch from Ian Jackson to add more
+ translations and more inline with the GNOME HIG. (Closes: #351807)
+ * widget/src/gtk2/nsWindow.cpp: Apply new ignore extended mouse buttons
+ patch from Peter Colberg (Closes: #351972)
+ * debian/firefox.1: Lower case first letter of -ContentLocale.
+ * debian/firefox.1, debian/firefox-runner: Add -no-remote switch to turn
+ on MOZ_NO_REMOTE. Use it for profile related commands as
+ well. (Closes: #351717, #344849)
+ * wikipedia.gif.uu, wikipedia.src, rules, firefox.install: Patch from
+ Ian Jackson to add wikipedia search engine. (Closes: #354107)
+
+ [ Mike Hommey ]
+ * modules/libpref/src/init/all.js: Set default fonts for all languages to
+ serif, sans-serif and monospace. It might solve a lot of fonts problems.
+ * config/config.mk, config/make-jars.pl, configure.in,
+ security/nss/lib/fortcrypt/swfort/pkcs11/config.mk,
+ extensions/inspector/Makefile.in: Allow building without zip when
+ building flat chrome.
+ * configure: Ran autoconf accordingly to changes in configure.in.
+ * debian/control: Removed build dependency on zip.
+ * debian/rules: Build flat chrome.
+ * debian/firefox.install: Changed wildcards accordingly.
+ * config/rules.mk:
+ + Don't build chromelist.txt files.
+ + Fixed "jar" build so that inspector files don't get duplicated in the
+ extension directory.
+
+ -- Eric Dorland <eric@debian.org> Sun, 26 Feb 2006 11:45:15 -0500
+
+firefox (1.5.dfsg+1.5.0.1-2) unstable; urgency=low
+
+ [ Mike Hommey ]
+ * debian/firefox-runner: export MOZ_DISABLE_PANGO. (Closes: #351959)
+ * debian/README.Debian: changed reference to the rc file in /etc.
+ (Closes: #351956)
+
+ [ Eric Dorland ]
+ * debian/firefox.preinst: Fix {}'s bashism. Thanks Jeff King. (Closes:
+ #351811)
+ * modules/libpref/src/init/all.js: Make print.postscript.print_command
+ space-safe. Thanks Ian Jackson. (Closes: #351809)
+ * debian/firefox-runner: Don't completely override
+ $MOZ_PLUGIN_PATH. Thanks Ian Jackson. (Closes: #351806)
+
+ -- Eric Dorland <eric@debian.org> Thu, 9 Feb 2006 01:23:35 -0500
+
+firefox (1.5.dfsg+1.5.0.1-1) unstable; urgency=low
+
+ * The "those Ubuntu guys are great after all" release.
+ * New upstream release. (Closes: #351442)
+
+ [ Mike Hommey ]
+ * debian/presubj: Added indications to try to reproduce without extensions
+ before actually filing a bug, and a hint to the safe mode.
+ * debian/firefox.install: added the reporter chrome files. (Closes: #344888)
+ * widget/src/gtk2/nsWindow.cpp: Revert additional stale patch for
+ extended mouse buttons support.
+ * debian/firefox.postinst, debian/firefox.prerm: unbashified.
+ (Closes: #349946)
+ * debian/control, debian/firefox-gnome-support.postinst,
+ debian/firefox-gnome-support.prerm: Let the firefox-gnome-support
+ package provide gnome-www-browser and handle a gnome-www-browser
+ alternative. Thanks Loïc Minier. (Closes: #350788)
+ * debian/firefox-runner: Enable Pango support by default. The
+ MOZ_ENABLE_PANGO environment variable is now useless. (Closes: #338716)
+ * debian/README.Debian: Change the paragraph about Pango to hint about
+ the MOZ_DISABLE_PANGO variable.
+
+ [ Eric Dorland ]
+ * content/events/src/nsEventStateManager.cpp,
+ modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h: Apply
+ patch from Ian Jackson to revert a stale patch for multiple mouse
+ button support that was fixed in a different way in 1.5
+ (Closes: #348375)
+ * debian/firefox.preinst: Check md5sum's of old conffiles before cp'ing
+ them on upgrade. This won't stop all unnecessary conffile prompting in
+ all situations (especially from really old versions), but should
+ definitely should work for upgrading from testing or stable. (Closes:
+ #345112)
+ * debian/firefox.install:
+ - Remove run-mozilla.sh. (Closes: #348902)
+ - Reorganize things a bit.
+ - Move profile into /etc/firefox here, instead of in the rules file.
+ * debian/firefox.install, debian/firefox.preinst, debian/firefox.links,
+ debian/firefox.dirs, debian/rules: Move chrome, defaults, greprefs
+ into /usr/share/firefox for more FHS goodnesss.
+ * debian/firefox.1: Document -new-tab and -new-window options, and
+ remove deprecated -remote option. (Closes: #348699)
+ * debian/firefox-runner: Apply patch to properly URL escape local
+ files. Thanks Morita Sho. (Closes: #348451)
+ * browser/app/profile/firefox.js:
+ - Reallow 40-bit ciphers, since now firefox warns people who
+ use them. (Closes: #349624)
+ - Enable bidi UI elements for our bi-directional friends.
+ (Closes: #348069)
+ * debian/rules: Remove glob pattern from dh_install invocation. Thanks
+ Ian Jackson. (Closes: #350571)
+ * browser/base/content/aboutDialog.xul: Fix spurious scrollbar in the
+ about dialog box. Thanks Ian Jackson. (Closes: #350608)
+ * js/src/fdlibm/fdlibm.h: Patch to fix little endianess of
+ mipsel. Thanks Ian Jackson and Thiemo Seufer. (Closes: #350621)
+ * browser/base/content/search.xml: Patch from Ian Jackson to remove
+ misleading Clear option from search box context menu. (Closes: #350611)
+ * debian/watch: Fix regex to actually find the upstream tarballs.
+ * modules/libpref/src/init/all.js: Cope better with printers with spaces
+ in the name. Thanks Ian Jackson.
+ * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Take patch
+ from bz#235336 as suggested by Ian Jackson to allow password manager
+ to work with sites that only have a password field, no username.
+
+ -- Eric Dorland <eric@debian.org> Mon, 6 Feb 2006 23:10:29 -0500
+
+firefox (1.5.dfsg-4) unstable; urgency=low
+
+ [ Eric Dorland ]
+ * debian/control, debian/rules:
+ - Remove Kerberos options, it is now loaded dynamically.
+ - Use /usr/share/firefox now for finding default.xpm.
+ * debian/firefox.install, debian/firefox.links, debian/firefox.preinst:
+ Start moving some clearly non-arch specific things
+ (/usr/lib/firefox/searchplugins, /usr/lib/firefox/icons,
+ /usr/lib/firefox/res) out of /usr/lib/firefox and into
+ /usr/share/firefox to make things more FHS friendly. Can't believe no
+ one ever called me on this before.
+ * toolkit/components/remote/nsGTKRemoteService.cpp,
+ widget/src/xremoteclient/XRemoteClient.cpp: Apply patch from bz#312154
+ to fix remote interface on PPC (and probably other arches). (Closes:
+ #343913)
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp: Patch from
+ Zack Weinberg to fix FTBFS on m68k. (Closes: #343687)
+ * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp: Patch from Antti
+ P Miettinen to fix small optimization problem with newer gcc's
+ (Closes: #344846)
+
+ [ Mike Hommey ]
+ * debian/firefox-runner: Cleaned up now useless variables.
+
+ -- Eric Dorland <eric@debian.org> Tue, 10 Jan 2006 10:11:34 -0500
+
+firefox (1.5.dfsg-3) unstable; urgency=low
+
+ * debian/control:
+ - Need explicit build dependency on gtk >= 2.8.
+ - Upgrade Standards-Version to 3.6.2.1. No changes.
+ - Add compatibility packages for mozilla-firefox-dom-inspector
+ and mozilla-firefox-gnome-support and make all the upgrade packages
+ Architecture: all. (Closes: #343879, #344379)
+ * debian/watch: Add watch file.
+ * debian/about.png.uu: Add uuencoded version of previous about box
+ graphic.
+ * debian/rules: uudecode and install the about.png into the right
+ location.
+ * debian/firefox-runner: Add MOZ_PLUGIN_PATH to include plugins at the
+ old location for now. (Closes: #344085, #341682)
+ * widget/src/gtk2/nsWindow.cpp: Patch from bz#305970 to fix broken
+ contextual menu on Save File As. (Closes: #344430)
+
+ * config/mkdepend/imakemdep.h, security/nss/lib/pki1/pki1.h: Remove some
+ patches that are now useless (suggested by Mike Hommey).
+ * mailnews/extensions/palmsync/palm.html,
+ browser/themes/pinstripe/browser/browser.css,
+ gfx/src/mac/nsNativeThemeMac.h,
+ directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt,
+ layout/html/tests/table/bugs/bug123862.html,
+ layout/html/tests/table/bugs/bug119786.html,
+ layout/html/tests/table/bugs/bug101759.html,
+ layout/html/tests/table/bugs/bug14489.html,
+ layout/html/tests/table/bugs/bug222846.html,
+ layout/html/tests/block/bugs/155333-1.html,
+ layout/html/tests/block/bugs/185411-2.html,
+ layout/html/tests/block/bugs/13599.html,
+ layout/html/tests/block/bugs/53960.html,
+ layout/html/tests/block/bugs/155333-2.html,
+ layout/html/tests/block/bugs/38157-a.html,
+ layout/html/tests/block/bugs/38157-b.html,
+ layout/html/tests/block/bugs/46918.html,
+ layout/html/tests/block/printing/145305-11.html,
+ layout/html/tests/block/printing/145305-21.html,
+ layout/html/tests/block/printing/145305-13.html,
+ layout/html/tests/block/printing/145305-17.html,
+ layout/html/tests/block/printing/145305-19.html,
+ layout/html/tests/block/printing/145305-4.html,
+ layout/html/tests/block/printing/127145-1.html,
+ layout/html/tests/block/printing/145305-3.html,
+ layout/html/tests/block/printing/145305-7.html,
+ layout/html/tests/block/printing/145305-9.html,
+ layout/html/tests/frameset/core/r3.html,
+ layout/html/tests/frameset/core/r4.html,
+ layout/html/tests/frameset/core/blank2.html,
+ xpinstall/packager/stage_mfcembed.pl, xpinstall/packager/stage_gre.pl,
+ embedding/qa/testembed/Tests.cpp,
+ embedding/qa/testembed/nsihttpchanneltests.cpp,
+ embedding/qa/testembed/BrowserImpl.cpp,
+ embedding/qa/testembed/Tests.h, embedding/qa/testembed/QaUtils.cpp,
+ embedding/qa/testembed/resource.h,
+ embedding/qa/testembed/DomWindow.cpp,
+ embedding/qa/testembed/QaUtils.h, build/unix/abs2rel.pl,
+ xpfe/bootstrap/icons/windows/readme.txt,
+ security/nss/cmd/ssltap/ssltap-manual.html: Fix mess my subversion
+ repository made of line endings. This should reduce the size of the
+ diff.gz dramatically.
+
+ -- Eric Dorland <eric@debian.org> Sat, 24 Dec 2005 03:23:02 -0500
+
+firefox (1.5.dfsg-2) unstable; urgency=low
+
+ * browser/locales/en-US/chrome/branding/brand.dtd,
+ browser/locales/en-US/chrome/branding/brand.properties: Change brand
+ name from Deer Park to Firefox. About box graphic still needs to be
+ fixed. *grumble* *grumble* (Closes: #343704)
+
+ -- Eric Dorland <eric@debian.org> Sat, 17 Dec 2005 13:45:14 -0500
+
+firefox (1.5.dfsg-1) unstable; urgency=low
+
+ * New upstream release. No actual code changes from RC3. Took the
+ opportunity to completely empty the /other-licenses directory of the
+ upstream tarball.
+ * configure, configure.in: Change MOZ_APP_DISPLAYNAME to Firefox, so we
+ can be called Firefox without using
+ --enable-official-branding. *grumble*
+ * config/autoconf.mk.in, gfx/src/gtk/mozilla-decoder.cpp, configure.in:
+ Apply patch from bz#305185 to fix problems building against gtk+ 2.8.
+ * debian/control:
+ - Build-Depend on libfreetype6-dev since we do link
+ against it directly.
+ - Add mozilla-firefox package for easy transition.
+ - Conflict against older mozilla-firefox packages.
+ * debian/firefox-runner:
+ - Fix typo. (Closes: #341113)
+ - Check /usr/lib/mozilla-firefox/plugins for plugins too for the
+ time being. (Closes: #341682)
+ * debian/firefox-dom-inspector.preinst: Remove, not needed since the
+ name change.
+ * debian/firefox.preinst:
+ - Remove old upgrade code.
+ - Move old mozilla-firefox configs into place on install.
+ * debian/mozilla-firefox.preinst: Move upgrade code in here. Remove
+ mozilla-firefox alternative.
+ * debian/mozilla-firefox.postrm: Remove /etc/mozilla-firefox on purge.
+
+ * Some patches missed when merging from Mike Hommey:
+ * browser/locales/en-US/searchplugins/answers.src: Change updateDays to
+ 0.
+ * config/mkdepend/imakemdep.h: Define for amd64.
+ * configure, configure.in: Visibility patch for recent gcc's. (Closes:
+ #341766)
+ * modules/libpref/src/nsPrefService.cpp: Patch to load preferences from
+ defaults/syspref.
+ * content/events/src/nsEventStateManager.cpp: Extended mouse events
+ patch.
+ * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp,
+ gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.h,
+ gfx/src/x11shared/nsFontFreeType.cpp,
+ gfx/src/x11shared/nsFontFreeType.h,
+ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch to
+ use new freetype API.
+
+ -- Eric Dorland <eric@debian.org> Fri, 16 Dec 2005 11:37:23 -0500
+
+firefox (1.4.99+1.5rc3.dfsg-2) unstable; urgency=low
+
+ * The "Grand Renaming" release. Thanks to Mike Hommey for sherperding
+ the 1.5 series through experimental. Now it's my turn to muck it up. A
+ transition packages will be in the next release.
+ * debian/mozilla-firefox*: Rename to firefox*.
+ * debian/firefox.install, debian/firefox-dom-inspector.install,
+ debian/firefox-gnome-support.install, debian/firefox-runner,
+ firefox-xremote-client, firefox.1, firefox.desktop, firefox.dirs,
+ debian/firefox.js, debian/firefox.links, debian/firefox.manpages,
+ debian/firefox.menu, debian/firefox.mime, debian/firefox.postinst,
+ debian/firefox.prerm, debian/firefox.png.uu, debian/README.Debian,
+ debian/control, debian/rules: Search/Replace mozilla-firefox ->
+ firefox where appropriate.
+ * debian/firefox.links: Link old icon name to new.
+ * debian/README.Debian: Fix path to .mozilla/firefox/rc. (Closes:
+ #335433)
+ * config/autoconf.mk.in: Set mozappdir to /usr/lib/firefox.
+
+ -- Eric Dorland <eric@debian.org> Sun, 27 Nov 2005 20:03:02 -0500
+
+mozilla-firefox (1.4.99+1.5rc3.dfsg-1) experimental; urgency=low
+
+ * New upstream 1.5 preview release. Release Candidate 3.
+ * debian/mozilla-firefox-runner: Removed the ping stuff, it's now done by
+ firefox itself.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 18 Nov 2005 07:24:05 +0100
+
+mozilla-firefox (1.4.99+1.5rc2.dfsg-1) experimental; urgency=low
+
+ * New upstream 1.5 preview release. Release Candidate 2.
+ * xpcom/typelib/xpidl/xpidl.c: Fix crash when no file is given on the
+ command line (Closes: #323639). Also fix the error message about extra
+ arguments given showing before the crash.
+ * configure.in, configure: Work around dash's bug #337294 so that we can
+ build fine when sh is dash (Closes: #211010, #256384).
+ * debian/mozilla-firefox-runner:
+ - Removed the code to detect the JVM and set LD_ASSUME_KERNEL=2.2.5 for
+ b0rked 1.3 JVMs: it's been a long time they've not been ABI compatible.
+ - Removed setting of MOZILLA_FIVE_HOME. We already have a default one
+ built-in.
+ - Removed /usr/lib/mozilla/plugins from EXTENT_LD_LIB_PATH, since we never
+ get the plugins from there.
+ - Removed cleanup of the profile. It is correctly done by firefox, now.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 11 Nov 2005 08:07:05 +0100
+
+mozilla-firefox (1.4.99+1.5rc1.dfsg-1) experimental; urgency=low
+
+ * New upstream 1.5 preview release. Release Candidate 1.
+ * debian/mozilla-firefox.install: Don't install
+ /usr/lib/mozilla-firefox/extensions/reporter@mozilla.org, it got moved in
+ the chrome.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 1 Nov 2005 22:01:15 +0100
+
+mozilla-firefox (1.4.99+1.5beta2.dfsg-1) experimental; urgency=low
+
+ * build/unix/run-mozilla.sh, netwerk/base/src/nsStandardURL.cpp:
+ Reverted debian changes: they got applied upstream.
+ * configure: Applied configure.in changes by hand.
+ * debian/rules: Disabled both the installer and the updater, we don't need
+ them.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 7 Oct 2005 15:06:05 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-5) experimental; urgency=low
+
+ * debian/control: Bumped Standards-Version to 3.6.2.
+ * nsprpub/configure.in: Reverted changed.
+ * configure.in: Use -fvisibility=hidden in all cases. There is another bug
+ in gcc that makes it generate position dependent code when using the
+ system wrappers.
+ * configure, nsprpub/configure: Applied configure.in changes with
+ autoconf2.13.
+ * debian/rules: Put back the /usr/share/pixmaps/mozilla-firefox.xpm file.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 3 Oct 2005 18:46:50 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-4) experimental; urgency=low
+
+ * xpcom/typelib/xpt/src/Makefile.in: Reverted changes.
+ * configure.in, nsprpub/configure.in: Added a detection of the gcc bug about
+ visibility for builtins, and use -fvisibility=hidden instead of the system
+ wrappers in case the bug is found.
+ * configure, nsprpub/configure: Applied configure.in changes with
+ autoconf2.13. (Really closes: #329642)
+
+ -- Mike Hommey <glandium@debian.org> Tue, 27 Sep 2005 20:16:34 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-3) experimental; urgency=low
+
+ * Sync with unstable branch.
+ * xpcom/typelib/xpt/src/Makefile.in: disable visibility stuff for ppc, as a
+ workaround for FTBFS. (Closes: #329642)
+
+ -- Mike Hommey <glandium@debian.org> Mon, 26 Sep 2005 18:35:11 +0200
+
+mozilla-firefox (1.0.7-1) unstable; urgency=high
+
+ * New upstream release. Contains fixes for various security issues.
+ * debian/mozilla-firefox-runner: Remove /usr/lib from
+ LD_LIBRARY_PATH. (Closes: #321789)
+
+ -- Eric Dorland <eric@debian.org> Thu, 22 Sep 2005 01:23:10 -0400
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-2) experimental; urgency=low
+
+ * debian/rules: enabled support for canvas.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 20 Sep 2005 07:56:01 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-1) experimental; urgency=low
+
+ * Cleaned-up source tarball from trademarked content and CVS directories.
+ * debian/mozilla-firefox-small.xpm, debian/mozilla-firefox.xpm: Removed.
+ * debian/mozilla-firefox.dirs, debian/rules:
+ + Create /usr/lib/mozilla-firefox/chrome/icons/default and move
+ default.xpm in it. (Closes: #327828)
+ + Stop using our own xpm icons, upstream provide them, now.
+ * debian/rules: changed the build system a bit.
+ * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Somewhat these
+ files disappeared. Put them back. (Closes: #328074)
+
+ -- Mike Hommey <glandium@debian.org> Tue, 13 Sep 2005 18:25:48 +0200
+
+mozilla-firefox (1.4.99+1.5beta1-2) experimental; urgency=critical
+
+ * Sync with unstable branch.
+ * netwerk/base/src/nsStandardURL.cpp: Apply the patch for the 1.8 branch
+ from bz#307259 to fix CAN-2005-2871. (Closes: #327452)
+ * debian/mozilla-firefox-gnome-support.install, debian/rules: Move out
+ imgicon module in mozilla-firefox-gnome-support. (Closes: #327451)
+
+ -- Mike Hommey <glandium@debian.org> Sun, 11 Sep 2005 10:45:34 +0200
+
+mozilla-firefox (1.0.6-5) unstable; urgency=critical
+
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: Fix for previous
+ arm fix. Thanks Steve. (Closes: #325535)
+ * netwerk/base/src/nsStandardURL.cpp: Patch from bz#307259 to fix
+ CAN-2005-2871, a buffer overflow vulnerability in IDN
+ processing. (Closes: #327452)
+
+ -- Eric Dorland <eric@debian.org> Sat, 10 Sep 2005 23:03:26 -0400
+
+mozilla-firefox (1.4.99+1.5beta1-1) experimental; urgency=low
+
+ * New upstream beta release.
+ + Find toolbar doesn't show up when in text fields. Closes: #280852.
+ + Better use of GTK2 themes. The most common case was highlighted menu
+ item text appearing in white on a white background. Closes: #223696,
+ #257430, #258181, #266334, #278559, #289326, #297320, #310098.
+ + Download manager correctly closes. Closes: #259015, #269975.
+ + Doesn't crash with the http://ln.hixie.ch/resources/style/orange
+ stylesheet. Closes: #277987.
+ + Locale extensions can properly be disabled. Closes: #279749 (to check).
+ + Doesn't crash on
+ http://einsteinmg.dyndns.org/cgi-bin/remangle.cgi?=0x27b9b660 anymore.
+ Closes: #294372.
+ + Downloads don't freeze when a modal window opens. Closes: #211332.
+ + Use GTK stock images. Closes: #281660.
+ * Sync with unstable branch changes.
+ * browser/app/profile/firefox.js, debian/firefox.js:
+ + Removed outdated extensions.update.autoUpdateEnabled and
+ extensions.update.autoUpdate;
+ + Removed general.useragent.locale.
+ + Allow extensions updates. It works correctly with system-wide installed
+ ones, now.
+ * netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,
+ nsprpub/pr/include/md/_linux.cfg, widget/src/gtk2/mozdrawingarea.c,
+ widget/src/gtk2/nsDragService.cpp: Reversed changes, since they got
+ applied upstream.
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: correctly set
+ __attribute__. Closes: #325535.
+ * debian/rules:
+ + set --enable-extensions=default instead of a full list.
+ We will get the default set of extensions provided by upstream, and
+ won't need to check if they changed.
+ + set --enable-pango.
+ + set --enable-system-cairo.
+ * debian/control: added build dependency on libgnomeui-dev and libcairo2-dev.
+ * debian/mozilla-firefox.install, debian/rules: don't install files in
+ /usr/lib/mozilla-firefox/chrome/icons/ anymore.
+ * debian/mozilla-firefox-runner: Force MOZ_DISABLE_PANGO to 1 if
+ MOZ_ENABLE_PANGO is not set.
+ * debian/README.Debian:
+ + Removed the note about IDN, it is now enabled by default, with correct
+ whitelist set.
+ + Added a note about MOZ_ENABLE_PANGO.
+ + Changed notes about application update, extensions, and packaged
+ extensions.
+ * modules/libpref/src/init/all.js:
+ + Set general.config.obscure_value to 0, we don't care about the config
+ file not to be "obscured".
+ + Set general.config.filename to firefox.cfg.
+ * debian/firefox.cfg: Create configuration to lock some properties.
+ * debian/mozilla-firefox.install: Install this firefox.cfg in
+ /usr/lib/mozilla-firefox
+
+ -- Mike Hommey <glandium@debian.org> Fri, 9 Sep 2005 17:40:40 +0200
+
+mozilla-firefox (1.0.6-4) unstable; urgency=low
+
+ * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp: Patch
+ from Steve Langasek to fix unused vs. used gcc attribute on alpha and
+ arm. (Closes: #325535)
+ * browser/app/profile/firefox.js: Revert patch to remove the "I'm
+ feeling lucky" search. Some like it, some hate it, so upstream
+ behaviour wins. If you still feel strongly about it, make your case
+ upstream.
+ * gfx/src/gtk/nsFontMetricsXft.cpp: Apply patch from bz#252033 to work
+ around a bug in XRender that might be causing #319349.
+
+ -- Eric Dorland <eric@debian.org> Tue, 6 Sep 2005 02:10:07 -0400
+
+mozilla-firefox (1.0.99+deerpark-alpha2-2) experimental; urgency=low
+
+ * Sync with unstable branch changes, except the controversial "I'm feeling
+ lucky" change. I prefer waiting for the controversy to get to a
+ conclusion.
+ * debian/rules, debian/control: Remove build dependency on libmng-dev and
+ the --with-system-mng option to configure, the MNG support has been
+ removed upstream.
+ * debian/rules: Explicitely set the svg-renderer as cairo. It will use an
+ old cairo version bundled with firefox, but there's no other solution for
+ the moment. We have to wait for upstream 0.9.x and greater support
+ (hoped for 1.5).
+
+ -- Mike Hommey <glandium@debian.org> Sun, 4 Sep 2005 09:01:54 +0200
+
+mozilla-firefox (1.0.6-3) unstable; urgency=low
+
+ * debian/rules, nsprpub/pr/include/md/_linux.cfg,
+ security/coreconf/Linux.mk: Apply patch from Andreas Jochens to allow
+ ppc64 builds. (Closes: #322617)
+ * debian/mozilla-firefox.prerm: Move -depth option to find to suppress
+ warnings. Thanks Mike Hommey.
+ * debian/presubj: Have bugzilla bug URL point to a page where you can
+ enter a bug.
+ * browser/app/profile/firefox.js: removed the "I'm feeling lucky" from
+ the keyword.URL, so now if you enter search terms in the address bar
+ you will be presented with search results and not taken to the first
+ result. Thanks Torok Edwin. (Closes: #321823)
+
+ -- Eric Dorland <eric@debian.org> Mon, 22 Aug 2005 01:20:28 -0400
+
+mozilla-firefox (1.0.6-2) unstable; urgency=medium
+
+ * modules/libpr0n/src/imgLoader.cpp, modules/libpr0n/src/imgLoader.h:
+ Apply ported patch from Serge Belyshev from bz#293307 to fix problem
+ with gcc-4.0 on amd64. (Closes: #319336)
+ * debian/rules: Remove silly --enable-freetype configure line. Thanks
+ Antony Gelberg. (Closes: #319886)
+
+ -- Eric Dorland <eric@debian.org> Sat, 30 Jul 2005 02:11:03 -0400
+
+mozilla-firefox (1.0.6-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #318672)
+ * debian/rules: Remove hack to use gcc 3.4 on amd64, since now we're all
+ on gcc 4.0. (Closes: #318684)
+ * debian/control:
+ - Remove gcc 3.4 build depends on amd64
+ - Explicitly build depend on libxinerama-dev.
+ * gfx/src/gtk/nsScreenGtk.cpp: Patch from Loic Minier to fix
+ gdk_property_get warnings.
+ * widget/src/gtk2/mozdrawingarea.c: Patch from Loic Minier to fix
+ crashes under GTK 2.7. (Closes: #318903)
+
+ -- Eric Dorland <eric@debian.org> Wed, 20 Jul 2005 02:57:44 -0400
+
+mozilla-firefox (1.0.99+deerpark-alpha2-1) experimental; urgency=low
+
+ * New upstream alpha release. Be aware that you WILL have troubles with
+ debian packages for firefox extensions.
+ * Reverted patches that got incorporated upstream.
+ * content/events/src/nsEventStateManager.cpp: Some changes to the previous
+ patch to fit changes in API.
+ * debian/update-mozilla-firefox-chrome,
+ debian/update-mozilla-firefox-chrome.8,
+ debian/mozilla-firefox-dom-inspector.post(inst|rm),
+ debian/mozilla-firefox-gnome-support.post(inst|rm),
+ debian/theme/*, debian/inspector/*: Removed.
+ * debian/mozilla-firefox.postinst: Removed call to
+ update-mozilla-firefox-chrome.
+ * debian/mozilla-firefox-dom-inspector.install: Only install files from
+ /usr/lib/mozilla-firefox/extensions/inspector@mozilla.org
+ * debian/mozilla-firefox.dirs: Don't create /var/lib/mozilla-firefox/*,
+ /usr/lib/mozilla-firefox/extensions nor /usr/lib/mozilla-firefox/plugins.
+ * debian/mozilla-firefox.install:
+ - Don't install regxpchrome, chrome/pipnss.jar and chrome/help.jar which
+ don't exist anymore.
+ - Install manifest files in addition to jar files in chrome.
+ - Install classic.jar in the normal chrome directory (awaiting EM
+ modifications so that it can actually go back in the extensions
+ directory).
+ - Don't install debian/theme/00classic and debian/theme/Uninstall,
+ which got removed.
+ - Get the theme in the correct directory (it's not in
+ defaults/profile/extensions anymore).
+ - Install the reporter extension.
+ - Selectively install subdirectories of /usr/lib/mozilla-firefox/defaults,
+ since some of them are useless.
+ - Install the unixprint plugin.
+ * debian/mozilla-firefox.manpages: Removed manual page for
+ update-mozilla-firefox-chrome.
+ * debian/mozilla-firefox.links: Removed all links in
+ /var/lib/mozilla-firefox/.
+ * debian/rules:
+ - Enable freetype in the build, we'll see if deerpark is any better than
+ 1.0.x.
+ - Commented out OPTFLAGS set for some architectures. We will see if gcc
+ 4.0 is doing any better.
+ - Enabled SVG support. (Closes: #215990)
+ - Enabled some more extensions to fit extensions provided by upstream.
+ - Added needed --enable-application=browser to the ./configure call.
+ - Don't install update-mozilla-firefox-chrome.
+ - Don't create installed-chrome.txt.
+ - Don't remove installed-extensions.txt, it doesn't exist anyway.
+ - Don't move classic theme's install.rdf, it's already at the correct
+ place.
+ - Remove unneeded removals of preferences files which are not there
+ anymore.
+ * debian/mozilla-firefox.preinst: Clean-up old generated files (those in
+ /var/lib/mozilla-firefox and
+ /usr/lib/mozilla-firefox/extensions/*/uninstall/Uninstall. (Note that for
+ the latter, some packages do provide them, but they were overwritten by
+ update-mozilla-firefox-chrome. They have actually no use, and it is safe
+ to remove them. Extensions packages will eventually remove them anyway)
+ * debian/mozilla-firefox.prerm: Put -depth option of find before -type d.
+
+ -- Mike Hommey <glandium@debian.org> Sat, 16 Jul 2005 10:18:40 +0200
+
+mozilla-firefox (1.0.5-1) unstable; urgency=high
+
+ * New upstream release, fixes security issues. (Closes: #318061)
+ * debian/rules: Disable freetype in the build for the time being. This
+ *might* break printing in some cases.
+ * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp,
+ gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.cpp,
+ gfx/src/ps/nsFontMetricsPS.h, gfx/src/x11shared/nsFontFreeType.cpp,
+ gfx/src/x11shared/nsFontFreeType.h,
+ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch
+ from bz#234035 to try to get building with the new freetype. (Closes:
+ #314243)
+
+ -- Eric Dorland <eric@debian.org> Sat, 16 Jul 2005 00:43:54 -0400
+
+mozilla-firefox (1.0.4-3) unstable; urgency=low
+
+ * debian/mozilla-firefox.desktop: Add Czech translation from Jan
+ Outrata. (Closes: #311376)
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp,
+ xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Revert patch from
+ David Mosberger for 7+ args on ia64 that was added 1.0.3-2.
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf32.cpp,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf32.s,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp,
+ xpcom/reflect/xptcall/public/genstubs.pl: Better patch from bz#291378
+ which has been accepted upstream for ia64 7+ args fix.
+ * xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Call genstubs.pl to
+ regenerate this file.
+ * dom/src/base/nsGlobalWindow.cpp,
+ embedding/components/windowwatcher/src/nsWindowWatcher.cpp: Fix
+ injection spoofing, patch from bz#296850. Fixes CAN-2004-0718.
+
+ -- Eric Dorland <eric@debian.org> Thu, 9 Jun 2005 23:54:41 -0400
+
+mozilla-firefox (1.0.4-2) unstable; urgency=critical
+
+ * debian/control: Build-depend on libxft-dev not libxft2-dev to appease
+ finicky sparc buildd.
+
+ -- Eric Dorland <eric@debian.org> Mon, 16 May 2005 21:17:57 -0400
+
+mozilla-firefox (1.0.4-1) unstable; urgency=critical
+
+ * New upstream release. Fixes CAN-2005-1477 and CAN-2005-1476. (Closes: #308620)
+ * debian/update-mozilla-firefox-chrome.8: Patch from A Costa to fix the
+ spelling of maintenace. (Closes: #305968)
+ * debian/mozilla-firefox.desktop: Patch from Steinar H. Gunderson to add
+ a Norwegian translation. (Closes: #305983)
+
+ -- Eric Dorland <eric@debian.org> Thu, 12 May 2005 22:59:47 -0400
+
+mozilla-firefox (1.0.3-2) unstable; urgency=high
+
+ * browser/app/profile/firefox.js: Disable SSLv2 and 40-bit ciphers by
+ default.
+ * debian/mozilla-firefox.NEWS: Explain the SSL change.
+ * extensions/transformiix/source/base/Double.cpp: Patch from David
+ Mosberger-Tang (fixed up by me) to fix unaligned access on ia64 (and
+ perhaps other platforms). (Closes: #303518)
+ * xpcom/reflect/xptcall/public/xptcstubsdecl.inc,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp: Another patch
+ from David Mosberger-Tang to fix extension loading on ia64. (Closes:
+ #303515)
+
+ -- Eric Dorland <eric@debian.org> Thu, 21 Apr 2005 01:25:02 -0400
+
+mozilla-firefox (1.0.3-1) unstable; urgency=low
+
+ * New upstream release, fixes various security issues, so urgency high.
+ * js/src/fdlibm/fdlibm.h: Fix from David Mosberger to define ia64 as
+ little-endian arch (also added for mipsel). (Closes: #303438)
+
+ -- Eric Dorland <eric@debian.org> Sun, 17 Apr 2005 23:13:01 -0400
+
+mozilla-firefox (1.0.2-3) unstable; urgency=high
+
+ * gfx/src/freetype/nsFreeType.cpp,
+ netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,
+ security/nss/lib/pki1/oiddata.h, security/nss/lib/pki1/pki1.h,
+ widget/src/gtk2/nsDragService.cpp: Fixes for gcc-4.0,
+ bz#289238. (Closes: #301485)
+ * js/src/jsstr.c: Fix for JS memory access security bug, patch from
+ bz#288688. (Closes: #302775)
+
+ -- Eric Dorland <eric@debian.org> Wed, 6 Apr 2005 01:36:11 -0400
+
+mozilla-firefox (1.0.2-2) unstable; urgency=high
+
+ * Last upload should of been marked urgency=high because of the security
+ fixes.
+ * debian/mozilla-firefox.postinst: Fix ridiculous typos. (Closes:
+ #300685)
+ * debian/mozilla-firefox-runner: Use pgrep to detect esd and arts
+ instead. Thanks Craig Small for the advice. (Closes: #302086)
+
+ -- Eric Dorland <eric@debian.org> Fri, 1 Apr 2005 01:18:18 -0500
+
+mozilla-firefox (1.0.2-1) unstable; urgency=low
+
+ * New upstream release. Fixes CAN-2005-0399, CAN-2005-0401,
+ CAN-2005-0402. (Closes: #301243)
+ * debian/control: Update suggest for xprint rename. (Closes: #300976)
+ * xpcom/reflect/xptcall/src/md/unix/{Makefile.in,
+ xptcinvoke_asm_parisc_linux.s, xptcstubs_asm_parisc_linux.s}: Apply
+ patch from Ivar (Contributed by Randolph Chung) to fix Firefox on
+ hppa. (Closes: #286038)
+
+ -- Eric Dorland <eric@debian.org> Fri, 25 Mar 2005 02:30:10 -0500
+
+mozilla-firefox (1.0.1-3) unstable; urgency=low
+
+ * widget/src/gtk2/nsGtkKeyUtils.cpp: Patch from bz#108170 to fix broken
+ keymap for Germans. (Closes: #299781)
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: avoid
+ crashing when extension's install.rdf is broken. (Closes: #298796)
+ (MH)
+ * debian/mozilla-firefox.prerm: Remove
+ /usr/lib/mozilla-firefox/defaults/profile/extensions/Extensions.rdf on
+ uninstall. (Closes: #298636)
+ * debian/mozilla-firefox.postinst: Add little echo to tell people to
+ restart firefox after upgrades.
+ * debian/presubj: Add a note there about restarting firefox before
+ submitting bugs.
+ * debian/mozilla-firefox-runner: Properly quote $@ expansion. (Closes:
+ #300195)
+ * browser/locales/en-US/searchplugins/
+ {yahoo.src,google.src,eBay.src,dictionary.src,creativecommons.src,
+ amazondotcom.src}: Set updateCheckDays to 0, which avoids duplicated
+ search entries in the menu. (Closes: #299006, #299813)
+
+ -- Eric Dorland <eric@debian.org> Sun, 20 Mar 2005 17:08:12 -0500
+
+mozilla-firefox (1.0.1-2) unstable; urgency=high
+
+ * Changes by Mike Hommey:
+ * Urgency: high due to RC bug fix.
+ * debian/update-mozilla-firefox-chrome: Re-initialize Extensions.rdf
+ inside the script instead of relying on mozilla-firefox's default
+ behaviour, which just fails when defaults/profile/extensions/ \
+ Extensions.rdf doesn't exist (and it seems some people like to remove
+ files in /etc). (Closes: #294175)
+
+ * Changes by Eric Dorland:
+ * debian/mozilla-firefox.menu: Capitalize "browsers". Thanks Gerfried
+ Fuchs.
+ * debian/mozilla-firefox-runner: Fix from Marc Horowitz to fix sound
+ device detection. (Closes: #297088)
+ * toolkit/content/widgets/tabbrowser.xml: Apply patch from bz#283063, to
+ fix a memory leak when closing tabs. (Closes: #296749)
+ * xpfe/global/resources/content/bindings/browser.xml,
+ xpfe/global/resources/content/bindings/tabbrowser.xml,
+ toolkit/content/widgets/browser.xml,
+ toolkit/content/widgets/tabbrowser.xml: Apply patches from bz#131456
+ to fix various tab related memory leaks. (Closes: #280586)
+ * netwerk/protocol/http/src/nsHttpHandler.cpp: Patch from bz#265536 to
+ differentiate between AMD64 and i386. (Closes: #282592)
+
+ -- Eric Dorland <eric@debian.org> Sat, 5 Mar 2005 18:46:09 -0500
+
+mozilla-firefox (1.0.1-1) unstable; urgency=high
+
+ * New upstream release. (Closes: #296851)
+ - This release fixes the Secunia window injection bug,
+ CAN-2004-1156. (Closes: #293664)
+
+ * Changes by Mike Hommey:
+ * debian/rules: Some clean-up.
+ * debian/control: Changed my maintainer address.
+ * debian/README.Debian: Add a note about automatic updates for
+ extensions. (Closes: #296761)
+
+ * Changes by Eric Dorland:
+ * browser/app/profile/firefox.js: Remove disable IDN pref, it's the
+ default now anyway.
+
+ -- Eric Dorland <eric@debian.org> Tue, 1 Mar 2005 02:03:48 -0500
+
+mozilla-firefox (1.0+dfsg.1-6) unstable; urgency=high
+
+ * The "And I thought IE had security bugs!" release.
+ * toolkit/content/widgets/tabbrowser.xml,
+ xpfe/global/resources/content/bindings/tabbrowser.xml: Fix
+ "Firetabbing" vulnerability from bugzilla#280056, fixes
+ CAN-2005-0231. (Closes: #294415)
+ * modules/plugin/base/src/nsPluginHostImpl.cpp: Fix "Fireflashing"
+ vulnerability from bugzilla#280664, fixes CAN-2005-0232. (Also Closes:
+ #294415)
+ * build/unix/run-mozilla.sh: Patch from Javier Fernández-Sanguino Peña
+ to fix insecure temp file usage in run-mozilla.sh. (Closes: #294127)
+ * netwerk/base/src/nsStandardURL.cpp, netwerk/base/src/nsStandardURL.h:
+ Patch from bugzilla#261934 to make the network.enableIDN preference
+ work and again.
+ * browser/app/profile/firefox.js: Disable IDN by default. This doesn't
+ close #293975, but drops its severity.
+ * debian/README.Debian: Add warning and describe how to enable IDN.
+
+ -- Eric Dorland <eric@debian.org> Wed, 9 Feb 2005 22:56:17 -0500
+
+mozilla-firefox (1.0+dfsg.1-5) unstable; urgency=low
+
+ * debian/mozilla-firefox.desktop: Don't translate "Mozilla Firefox" into
+ French.
+ * browser/app/profile/firefox.js: Set mozilla.widget.raise-on-setfocus
+ to false to prevent unecessary window raising. (Closes: #292049)
+ * debian/rules: Don't compile statically on mips and mipsel, since it's
+ broken for now.
+
+ -- Eric Dorland <eric@debian.org> Sun, 6 Feb 2005 15:02:36 -0500
+
+mozilla-firefox (1.0+dfsg.1-4) unstable; urgency=low
+
+ * debian/mozilla-firefox.desktop: Add French translations from Jerome
+ Warnier. I will accept more, but closing this bug. (Closes: #292506)
+ * debian/README.Debian: Update the Emacs keybindings instructions.
+ (Closes: #291691)
+ * debian/mozilla-firefox.1:
+ - Remove -splash from the manpage, it has never worked. (Closes:
+ #287088)
+ - Add units to -height and -width description. (Closes: #285142)
+
+ -- Eric Dorland <eric@debian.org> Wed, 2 Feb 2005 01:42:53 -0500
+
+mozilla-firefox (1.0+dfsg.1-3) experimental; urgency=low
+
+ * debian/mozilla-firefox.desktop: Add %u to the exec line so that apps
+ know it can handle URLs. (Closes: #290132)
+ * debian/README.Debian:
+ - Improve button reversal instructions. Thanks Christian Mayrhuber
+ - Fix reference to ~/.firefox.
+ * debian/rules: Enable static building. This will build firefox as one
+ large binary (mostly) and should speed a few things up, especially
+ program load time. I'd like to hear about any speedup (or slow down)
+ you exprience. Porters, please build this for your arch to make sure
+ this doesn't break anything.
+
+ -- Eric Dorland <eric@debian.org> Thu, 20 Jan 2005 01:40:34 -0500
+
+mozilla-firefox (1.0+dfsg.1-2) unstable; urgency=medium
+
+ * debian/mozilla-firefox-gnome-support.postrm,
+ debian/mozilla-firefox-dom-inspector.postrm: Don't die if
+ update-mozilla-firefox-chrome dies. (Closes: #287355)
+
+ -- Eric Dorland <eric@debian.org> Sun, 9 Jan 2005 23:51:10 -0500
+
+mozilla-firefox (1.0+dfsg.1-1) unstable; urgency=low
+
+ * Not a new upstream release.
+ * other-licenses/branding/firefox, other-licenses/7zstub/firefox: Remove
+ these from the .orig.tar.gz, since they are not DFSG-free. We're not
+ using the files anyway, so out they go. (Not sure the 7zstub stuff is
+ non-free, but it's Windows only so no harm)
+ * debian/rules:
+ - Remove explicit low-optimization on alpha, since Falk
+ Hueffner claims it works.
+ - Move entire defaults/profile directory into /etc/mozilla-firefox,
+ rather than just the bookmarks.html. (Closes: #285538)
+ * debian/mozilla-firefox.links: Link entire defaults/profile now.
+ * debian/mozilla-firefox.preinst: Add upgrade code to remove old
+ defaults/profile to make way for new symlink.
+ * debian/mozilla-firefox.dirs: Just create etc/mozilla-firefox.
+
+ -- Eric Dorland <eric@debian.org> Sun, 19 Dec 2004 01:31:44 -0500
+
+mozilla-firefox (1.0-5) unstable; urgency=medium
+
+ * Changes by Mike Hommey:
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Make the
+ extensions upgrade work again. (Closes: #282143)
+ * debian/rules: Better DEB_BUILD_OPTIONS handling, better debugging
+ build (DEB_BUILD_OPTIONS="nostrip debug")
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+ toolkit/mozapps/extensions/content/extensions.js: Allow users to
+ disable globally installed extensions.
+
+ * Changes by Eric Dorland:
+ * debian/rules: Remove explicit low-optimization on sparc. Apparently
+ there was an issue for a number of arches that required lower
+ optimization settings, but it is now resolved. So porters, please
+ check -O2 on arm, alpha, powerpc and ia64 and let me know if it's
+ safe. Thanks David S. Miller. (Closes: #284533)
+
+ -- Eric Dorland <eric@debian.org> Tue, 7 Dec 2004 01:06:48 -0500
+
+mozilla-firefox (1.0-4) unstable; urgency=medium
+
+ * debian/control: Make mozilla-firefox-gnome-support and xprt-xprintorg
+ Suggests, no Recommends after a look at policy. (Closes: #282432)
+ * debian/README.Debian:
+ - Refer to .mozilla/firefox, not .firefox.
+ - Explain how to reenable emacs style keybindings. (Closes: #282321)
+
+ -- Eric Dorland <eric@debian.org> Sat, 27 Nov 2004 20:40:10 -0500
+
+mozilla-firefox (1.0-3) unstable; urgency=low
+
+ * Changes by Mike Hommey
+ * The "becoming more and more an iceweasel" release.
+ * debian/firefox.js:
+ + Enable firefox's internal locale autodetection.
+ + Disable default browser question at startup. (Closes: #280752)
+ * debian/mozilla-firefox-runner: Removed our locale autodetection.
+ That means now locales installed in user profiles are automatically
+ used, and that there is no need for /var/lib/mozilla-firefox/locales.d
+ anymore.
+ * debian/mozilla-firefox.dirs: Removed creation of
+ /var/lib/mozilla-firefox/locales.d.
+ * debian/rules: Removed creation of the locale file in
+ /var/lib/mozilla-firefox/locales.d.
+ * debian/presubj: Put some more recent information.
+ * htmlparser/src/nsParser.cpp: Applied patch from bz#57717 so that empty
+ html files don't get <html><body></body></html> when viewing source.
+ * browser/base/content/aboutDialog.css: increase the User Agent element
+ height as in bz#238137 (but up to MacOSX's height) to show the full User
+ Agent string.
+ * xpcom/io/nsAppDirectoryServiceDefs.h,
+ xpcom/io/nsAppFileLocationProvider.cpp,
+ xpfe/components/search/src/nsInternetSearchService.cpp: Applied patch from
+ bz#123315 so that Internet search services in user profiles are supported.
+ (Closes: #219053)
+ * debian/mozilla-firefox-runner:
+ + Remove compatibility.ini only if it is older than
+ /usr/lib/mozilla-firefox/components.ini. That way, we only rebuild it
+ after an update-mozilla-firefox-chrome.
+ + Detect if we're being run through sudo without the -H option, in which
+ case we force setting of $HOME. (Closes: #218156)
+ * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js.
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in:
+ + Removed some error messages that get there because firefox is trying to
+ write in the /usr/lib/mozilla-firefox directory as a user. They are
+ useless and lead users to think something is going wrong while it's the
+ (stupid but) normal way firefox works.
+ + Avoid creation of directories when attempting to read files, that
+ throwed uncaught exceptions breaking some stuff in several different
+ ways when extensions don't follow the new scheme for extensions.
+ + Avoid copying stuff from
+ /usr/lib/mozilla-firefox/defaults/profile/extensions/ to
+ /usr/lib/mozilla-firefox/extensions/, that's the *very* old way of
+ installing extensions, which, since the old scheme has been thrown away,
+ won't work anyway, if any extension provides files out there.
+ + CheckForMismatches: Avoid to disable already disabled global extensions,
+ and don't propose to upgrade the locked extensions. That fixes a
+ never-ending loop occuring when running firefox for the first time in a
+ user account, while some global extensions are expired.
+ (Closes: #278722, #281537)
+ * debian/mozilla-firefox.prerm, debian/mozilla-firefox.preinst: Moved
+ removal of links to /usr/lib/mozilla-firefox/defaults/profile/extensions/
+ sitting in /usr/lib/mozilla-firefox/extensions/, if any remaining, from
+ prerm to preinst. We remove them once and for all, they won't be created
+ by us anymore.
+ * debian/update-mozilla-firefox-chrome:
+ + Removed support for extensions in
+ /usr/lib/mozilla-firefox/defaults/profile/extensions/.
+ + Removed some clean-up that had been introduced to help the Extensions
+ Manager not to die, and which, actually, did not work out quite so well.
+ Anyways, with the changes this time, the EM is supposed to support much
+ more problems than ever before (as usual ;) ) so we don't need that
+ anymore.
+ + Avoid stupid mv error messages when firefox-bin -register fails (which
+ is not supposed to happen, but you're never too careful)
+ * debian/update-mozilla-firefox-chrome, debian/mozilla-firefox.preinst:
+ Move removal of some very old stuff to preinst, to do it once and for all
+ instead of doing it every time we run update-mozilla-firefox-chrome.
+ * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Applied patch from
+ bz#124561 to get a prompt for username/password in case anonymous login
+ fails.
+ * debian/mozilla-firefox-runner:
+ + Added check for more arguments so that the url in the command line get
+ detected more accurately.
+ + When a file name is given on the command line, prepend "file://" and
+ change spaces into %20. (Closes: #281800)
+
+ * Changes by Eric Dorland
+ * debian/mozilla-firefox.prerm: Patch from Philipp Weis to fix order of
+ find arguments. (Closes: #280852)
+ * debian/mozilla-firefox.desktop: Support new mime type handler in Gnome
+ 2.8. (Closes: #281274) (MH: I added some more myme-types)
+ * debian/mozilla-firefox.postinst: Run update-desktop-database if it
+ exists.
+ * widget/src/gtk/nsWidget.cpp: We don't use gtk anymore, might as well
+ revert these patches. Thanks Stephane Despret.
+
+ -- Eric Dorland <eric@debian.org> Thu, 18 Nov 2004 22:16:28 -0500
+
+mozilla-firefox (1.0-2) unstable; urgency=low
+
+ * Changes by Mike Hommey
+ * The "don't do too much on the same day, it's bad for health" release.
+ * debian/firefox.js: Re-activated the extensions update service, and
+ removed the update url.
+ * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js.
+ * debian/mozilla-firefox-dom-inspector.preinst: Removed old inspector.js
+ file.
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+ toolkit/mozapps/extensions/content/extensions.js: Disabled possibility
+ to update locked extensions and themes. Locked extensions being the
+ ones installed by the packaging system, they should be updated through
+ that.
+ * toolkit/mozapps/update/src/nsUpdateService.js.in: Disabled application
+ update functionnality. Firefox should be updated through the packaging
+ system.
+ * browser/components/prefwindow/content/pref-advanced.xul: Removed the
+ preferences panel item to activate application update, since it is
+ totally disabled.
+ * debian/mozilla-firefox-runner: Remove compatibility.ini instead of
+ compreg.dat. (Eric: This will cause a rebuild of the compreg.dat)
+
+ * Changes by Eric Dorland:
+ * debian/mozilla-firefox.NEWS: Fix typos.
+ * README.Debian:
+ - Add note about application update being completely disabled.
+ - Fix path to XUL.mfsal
+
+ -- Eric Dorland <eric@debian.org> Wed, 10 Nov 2004 22:56:22 -0500
+
+mozilla-firefox (1.0-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #280449)
+
+ * Changes by Mike Hommey:
+ * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch
+ #164795 from bz#266835 + some tweaks as previously. This might lead to
+ encoding problems with the password, but it is supposed to be ASCII
+ anyway.
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Reworked the
+ previous patches so that the Extensions Manager shows extensions that
+ have been disabled due to version mismatch, and added a workaround so
+ that components registration works correctly.
+ * debian/update-mozilla-firefox-chrome: Removed part that is useless due
+ to last changes in the Extensions Manager.
+ * Make the inspector a real extension again:
+ - debian/inspector/00dom-inspector: File for
+ /var/lib/mozilla-firefox/extensions.d.
+ - debian/inspector/Uninstall: Uninstall file needed in extension
+ directory.
+ - debian/inspector/install.rdf: install.rdf taken from older versions,
+ and adapted to newer versions, adding registered chrome.
+ - debian/mozilla-firefox-dom-inspector.dirs: Removed. Everything will
+ be created by dh_install.
+ - debian/mozilla-firefox-dom-inspector.install: install
+ debian/inspector.rdf and most inspector files in the right place in
+ /usr/lib/mozilla-firefox/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}
+ and /var/lib/mozilla-firefox
+ * Make the classic theme a real extension, even though it's still in
+ the main package:
+ - debian/theme/00classic: File for
+ /var/lib/mozilla-firefox/extensions.d.
+ - debian/theme/Uninstall: Uninstall file needed in extension
+ directory.
+ - debian/mozilla-firefox.install: Install all files in the right
+ place in
+ /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+ - debian/mozilla-firefox.dirs: Removed creation of
+ /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome,
+ it will be done by dh_install.
+ - browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in:
+ Added chrome to be registered.
+ * Removed support for /var/lib/mozilla-firefox/chrome.d:
+ - debian/mozilla-firefox.dirs: Removed creation of the directory.
+ - debian/rules: Removed creation of files there, and put the
+ installed-chrome.txt, excluding inspector and classic theme stuff,
+ directly in /usr/lib/mozilla-firefox/chrome.
+ - debian/update-mozilla-firefox-chrome: Removed all
+ /var/lib/mozilla-firefox/chrome.d related stuff.
+ - debian/mozilla-firefox.links: Removed installed-chrome.txt link.
+ - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: disable
+ extensions that fail to install chrome.
+ * debian/mozilla-firefox-runner: Remove user profile compreg.dat at
+ launch time.
+ * Moved some files in /var/lib/mozilla-firefox:
+ - debian/mozilla-firefox.links: Add a symlink for Extensions.rdf
+ and components.ini, from /usr to /var.
+ - debian/mozilla-firefox.prerm: Don't remove files we don't
+ provide and remove files at their new locations.
+ - debian/mozilla-firefox.preinst: Remove
+ /var/lib/mozilla-firefox/installed-chrome.txt.
+ - debian/update-mozilla-firefox-chrome: Create links for
+ Extensions.rdf and components.ini after register call, and remove
+ components.ini before.
+ * Clean-up in files generated by update-mozilla-firefox-chrome:
+ - debian/mozilla-firefox.links: Put all the links generated by
+ update-mozilla-firefox-chrome into the package.
+ - debian/mozilla-firefox.prerm: Remove all /var files generated
+ in the remove target, and changed the way we clean-up
+ /var/lib/mozilla-firefox.
+ * debian/mozilla-firefox.install: Removed chromelist.txt.
+ * Add support for extensions preferences:
+ - debian/update-mozilla-firefox-chrome: Handle
+ /usr/lib/mozilla-firefox/defaults.ini file.
+ - debian/mozilla-firefox.links: Add a symlink to /var for
+ defaults.ini.
+ - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added
+ defaults registration in -register command.
+ - mozilla-firefox-dom-inspector.install: Move inspector.js into
+ the appropriate extension specific directory.
+ * Move preferences back into /usr:
+ - debian/rules: Don't move the prefs into
+ /etc/mozilla-firefox/pref, and put the vendor thing into /usr
+ as well, and remove firefox-l10.js file.
+ - debian/mozilla-firefox.preinst: remove old prefs in /etc and
+ old symlink /usr/lib/mozilla-firefox/defaults/pref.
+ - debian/firefox.js: new Debian default preferences file.
+ - debian/mozilla-firefox.install: install firefox.js in
+ /etc/mozilla-firefox/pref.
+ - debian/mozilla-firefox.links: rename
+ /usr/lib/mozilla-firefox/defaults/pref symlink to
+ /usr/lib/mozilla-firefox/defaults/syspref.
+ - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added
+ a hook so that defaults/syspref gets registered in defaults.ini
+ after all other extensions preferences.
+ * debian/mozilla-firefox.preinst: only clean-up stuff if we are
+ upgrading from a version known to still have the files. Added some
+ more clean-up.
+ * debian/mozilla-firefox.install: Removed useless init.d.
+ * modules/libpref/src/init/all.js: Fixed all chrome URLs which refered to
+ mozilla stuff.
+ * debian/update-mozilla-firefox-chrome: Remove some more files before running
+ firefox-bin -register.
+
+ * Changes by Eric Dorland:
+ * debian/mozilla-firefox.NEWS: Add warning about broken extension and
+ locale packages with this release.
+ * debian/mozilla-firefox-runner: Comment out warning about xprint,
+ xprint isn't necessarily needed for printing since postscript was
+ reenabled. (Closes: #279858)
+
+ -- Eric Dorland <eric@debian.org> Wed, 10 Nov 2004 00:33:44 -0500
+
+mozilla-firefox (0.99+1.0RC1-4) unstable; urgency=low
+
+ * debian/mozilla-firefox-runner:
+ - Fixed to run properly with dash. (Closes: #279549).
+ - Fixed indentation.
+ - Added a basic debugger support.
+ * debian/mozilla-firefox.1: Added information about debugger options.
+ * debian/rules: Added a debug option to DEB_BUILD_OPTIONS. If you want to
+ build a fully gdb'able package, use DEB_BUILD_OPTIONS="noopt nostrip
+ debug"
+ * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch from
+ bz#266835.
+ - Further change this patch to use Append rather than AppendLiteral,
+ which doesn't seem to exist. (ED)
+
+ -- Mike Hommey <mh@glandium.org> Thu, 4 Nov 2004 22:01:51 +0900
+
+mozilla-firefox (0.99+1.0RC1-3) unstable; urgency=low
+
+ * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply patch from
+ bz#266835 to fix anonymous user password issue. (Closes: #226784)
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: (MH)
+ - Fully apply previous patches, which for some reason left a spurious code
+ line which made the extensions manager not like expired extensions
+ anymore. (Closes: #279140)
+ - Enhanced extensions manager so that the behaviour described in
+ https://bugzilla.mozilla.org/show_bug.cgi?id=247846#c14 *actually*
+ works. Extensions packagers are invited to move their chrome files
+ accordingly, and remove /var/lib/mozilla-firefox/chrome.d files so that
+ extensions chrome don't get registered when they are forced-disable due
+ to version mismatch or some other reason.
+ * debian/mozilla-firefox-runner:
+ - Fix some thinkos. (MH)
+ - Fix for loading files from the command line. (Closes: #279018) (MH)
+ - Removed setting --display from $DISPLAY, let it get it from the
+ environment, but pass --display if it is set. (Mike,
+ I'm worried this will screw up some session
+ managers, let me know what you think, we can revert it)
+ - Removed FIREFOX_OPEN_IN stuff, so that firefox now obeys to "open
+ links from other applications in" setting. (Closes: #279073) (MH)
+ - Enhanced command line parsing, and drop empty arguments.
+ (Closes: #279138) (MH)
+ - No need for a find to look for XUL.mfasl, we already have its
+ location from the path list taken from profiles.ini. (MH)
+ - Better detection of dsp wrapper, when FIREFOX_DSP=auto.
+ (Closes: #254611) (MH)
+ - Correctly open local files even when firefox was not previously
+ running. (Closes: #279018) (MH)
+ * debian/mozilla-firefox.1: (MH)
+ - Removed references to FIREFOX_OPEN_IN.
+ - Added the -safe-mode option.
+ * debian/mozilla-firefoxrc: Removed FIREFOX_OPEN_IN. (MH)
+
+ -- Eric Dorland <eric@debian.org> Tue, 2 Nov 2004 00:46:28 -0500
+
+mozilla-firefox (0.99+1.0RC1-2) unstable; urgency=medium
+
+ * browser/app/profile/firefox.js: Disable browser update checking by
+ default.
+ * debian/mozilla-firefox-runner: Apply patch from Aurelien Jarno to fix
+ variable name typo. (Closes: #278844)
+
+ -- Eric Dorland <eric@debian.org> Fri, 29 Oct 2004 23:50:59 -0400
+
+mozilla-firefox (0.99+1.0RC1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * layout/xul/base/src/nsImageBoxFrame.{cpp,h}: Remove some conflicts
+ from a previous patch.
+
+ -- Eric Dorland <eric@debian.org> Thu, 28 Oct 2004 23:33:46 -0400
+
+mozilla-firefox (0.10.1+1.0PR-5) unstable; urgency=low
+
+ * debian/rules: (MH)
+ - Use upstream extensions set. This will eventually get a
+ correct help menu and fix some yet undiscovered UI issues.
+ (Closes: #257946)
+ - Added support for DEB_BUILD_OPTIONS=noopt.
+ - Changed OPTFLAGS assignment.
+ - Remove whitespace characters in version number for UserAgent
+ branding.
+ - Install mozilla-firefox-runner into /usr/lib/mozilla-firefox/firefox
+ (Closes: #278477)
+ * debian/mozilla-firefox.links: (MH)
+ - Link /usr/bin/firefox and /usr/bin/mozilla-firefox to
+ /usr/lib/mozilla-firefox/firefox.
+ - Removed obsolete profile/US links.
+ * debian/mozilla-firefox.dirs: Create /etc/mozilla/profile instead of
+ /etc/mozilla/profile/US. (MH)
+ * toolkit/xre/nsAppRunner.cpp: Fix crash in nsCmdLineService::Initialize
+ when argc is changed by gtk (when treating gtk specific arguments)
+ (MH)
+ * debian/mozilla-firefox-runner (Changes by MH):
+ - Removed workaround for bug #122990. First, xmlterm is not an activated
+ extension, and secondly, if it still requires the TERM environment
+ variable, it is the user's duty to set it to whatever he wants, not
+ firefox's start script's.
+ - Removed the ulimit -c setting. First, it is set by default to 0 on a
+ newly installed debian, and secondly, it is user's choice to set it or
+ not if he needs to get core files.
+ - Removed unused shell variables.
+ - Removed unsetting AUDIODEV variable. If it still crashes, it does belong
+ to some other code than firefox. The AUDIODEV environment variable is
+ used nowhere in firefox code:
+ http://lxr.mozilla.org/aviarybranch/search?string=AUDIODEV
+ Note that there is a "A crash which occurred when AUDIODEV doesn't
+ contain "/" was fixed." log message in esound version 0.2.33 changes and
+ that the bug may have belonged there.
+ - Replaced ${HOME}/.mozilla-firefoxrc file by a ${HOME}/.mozilla/firefox/rc
+ file. The former is still supported, though, but will bring a warning
+ message. If both are present, only the latter is taken into account.
+ - Changed the way system and user FIREFOX_DSP and FIREFOX_OPEN_IN
+ variables are handled. First, use system values defined in
+ /etc/mozilla-firefox/mozilla-firefoxrc, then override with
+ ${HOME}/.mozilla/firefox/rc and then with runtime environment variables.
+ - Don't die when DISPLAY is not set. Display can be passed by --display
+ option, and if not set and needed (some options don't require it),
+ firefox will complain.
+ - Some shell code simplifications by using some coreutils.
+ - Added better command line parsing.
+ - Added verbosity mode.
+ - Removed setting of FONTCONFIG_PATH, /usr/lib/mozilla-firefox/res/Xft
+ doesn't exist
+ - Factorized localization detection.
+ * debian/mozilla-firefox.1 (MH):
+ - Made some clean-up between dashes and hyphens.
+ - Removed obsolete options and added new ones.
+ - Added informations about some debian specific stuff.
+ * debian/update-mozilla-firefox-chrome: Changed the way we move files to
+ /var/lib/mozilla-firefox. It will avoid creating files with a * in their
+ name whenever registration failed. (MH)
+ * debian/README.Debian: Update java instructions, tell them to just use
+ java-package.
+
+ -- Eric Dorland <eric@debian.org> Thu, 28 Oct 2004 21:30:40 -0400
+
+mozilla-firefox (0.10.1+1.0PR-4) unstable; urgency=medium
+
+ * This release mostly courtesy Mike Hommey.
+ * layout/src/xul/base/src/nsImageBoxFrame.*: Backported patch from
+ bz#255372. (Closes: #278046)
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Force locking
+ globally installed extensions, that will prevent extensions packages
+ files to be unexpectedly removed by firefox.
+ * debian/control: Add Mike Hommey as an Uploader.
+ * debian/mozilla-firefox.install: Removed content-packs.jar which is
+ mozilla-browser specific.
+ * debian/mozilla-firefox.dirs:
+ - Remove leading /'s.
+ - Create
+ /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+ /chrome directory so that preview is shown in the Themes Manager. Yes,
+ this is stupid, but it is the way firefox wants it (and it's not even
+ created by make install, nor in the official binary tarball. It is
+ only created at run time, but you know what ? under *nix, a normal
+ user can't create that directory) (Closes: #276404)
+ * debian/rules: Add a /etc/mozilla-firefox/pref/vendor.js file adding
+ the debian package version to the UserAgent. (Closes: #268654)
+ * debian/README.Debian: Update java instructions. I'd love some more
+ definitive pointers. (Closes: #277983)
+
+ -- Eric Dorland <eric@debian.org> Tue, 26 Oct 2004 00:11:48 -0400
+
+mozilla-firefox (0.10.1+1.0PR-3) experimental; urgency=low
+
+ * debian/control:
+ - Rename the mozilla-firefox-gnome-vfs package
+ mozilla-firefox-gnome-support since it does more than vfs. No
+ need for Replaces or anything, since it never actually made it to
+ the archive.
+ - Remove strict build dependencies on g++ and binutils, since the
+ fixed versions have hit sarge.
+ - Remove hppa build depends, since gcc has also been fixed there.
+ - Build-depend on libgnome2-dev and libgconf2-dev to build in more
+ gnome support.
+ - Have mozilla-firefox recommend it's gnome support.
+ * debian/rules:
+ - Remove hppa CC redefinitions.
+ - Exclude *gnome* not just *gnomevfs*.
+ - dh_install for gnome-support.
+ * debian/mozilla-firefox-gnome-vfs.*: Rename to
+ mozilla-firefox-gnome-support.*.
+ * debian/mozilla-firefox-gnome-support.install: Grab *gnome*, not just
+ *gnomevfs*.
+
+ -- Eric Dorland <eric@debian.org> Thu, 21 Oct 2004 23:04:53 -0400
+
+mozilla-firefox (0.10.1+1.0PR-2) experimental; urgency=low
+
+ * debian/mozilla-firefox-runner:
+ - Patch from Sam Morris to handle cleanup of directories with
+ unusual names.
+ - Fix return value check, patch from rgselk. (Closes: #269690)
+ * debian/mozilla-firefox.1: List full path to firefox-bin. (Closes:
+ #275563)
+ * debian/rules:
+ - --with-gssapi=/usr, enable Negotiate extension. (Closes:
+ #274258)
+ - Enable gnomevfs support,
+ * debian/control:
+ - Build-depend on libkrb5-dev.
+ - Build-depend on libgnomevfs2-dev.
+ - New gnomevfs package, based on work by Mike Hommey. (Closes:
+ #262062)
+ * debian/mozilla-firefox-gnome-vfs.post{inst,rm}: Added, same as
+ corresponding files from mozilla-firefox-dom-inspector.
+ * debian/mozilla-firefox-gnome-vfs.install: Install gnomevfs components.
+ * browser/app/profile/firefox.js: Set
+ network.negotiate-auth.trusted-uris to https:// to enable the
+ negotiate extension over secure links.
+ * config/rules.mk: Tweak patch from Thiemo Seufer to include svg_doc in
+ non-optimization. (Closes: #273353)
+
+ -- Eric Dorland <eric@debian.org> Sun, 17 Oct 2004 21:25:08 -0400
+
+mozilla-firefox (0.10.1+1.0PR-1) experimental; urgency=critical
+
+ * New upstream release, fixes security issue bz#259708. (Closes:
+ #274493)
+
+ -- Eric Dorland <eric@debian.org> Sun, 3 Oct 2004 03:32:43 -0400
+
+mozilla-firefox (0.10+1.0PR-1) experimental; urgency=low
+
+ * New upstream release. (Closes: #273700, #267003)
+ * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+ netwerk/dns/src/nsIDNService.cpp,
+ modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp,
+ gfx/src/windows/nsImageWin.cpp, gfx/src/shared/gfxImageFrame.cpp,
+ browser/app/profile/firefox.js: Resolve conflicts between my tree and
+ upstream.
+ * browser/app/Makefile.in: Fix $(DESTDIR) variable.
+ * accessible/src/atk/nsAccessibleWrap.cpp,
+ accessible/src/atk/nsAccessibleWrap.h: Apply patch from bugzilla for
+ alpha fix that's more likely to make it into CVS.
+ * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to make
+ update-mozilla-firefox-chrome more verbose on -v.
+ * debian/rules:
+ - Remove typeaheadfind for new find toolbar to work. (Mike Hommey)
+ (Closes: #267170)
+ - Changes to reflect new upstream files.
+ * debian/control:
+ - Remove build-depend on libcairo-dev.
+ - Build depend on libxt-dev, seems to be necessary now. (Closes:
+ #274311)
+ * debian/docs: Removed, as browser/README.html disappeared. (Mike Hommey)
+ * debian/mozilla-firefox.dirs:
+ - Changes to reflect new upstream files.
+ - Removed obsolete libnullplugin.so.
+ * debian/mozilla-firefox.install:
+ - Remove .jar's that aren't there anymore.
+ - Removed obsolete libnullplugin.so.
+ * debian/mozilla-firefox-dom-inspector.dirs,
+ debian/mozilla-firefox-dom-inspector.install, debian/rules: Upstream
+ doesn't consider DOM Inspector as a real extension, and do not provide
+ the appropriate files to make it appear in the extensions
+ manager. Removed all the extension related stuff in the package. (Mike
+ Hommey)
+ * other-licenses/libart_lgpl: Removed, was for SVG, no longer needed.
+ * modules/plugin/samples/default/unix/*: Reverted debian specific
+ changes, we don't want them in the diff since libnullplugin won't get
+ installed.
+
+ -- Eric Dorland <eric@debian.org> Fri, 1 Oct 2004 18:50:46 -0400
+
+mozilla-firefox (0.9.3-6) unstable; urgency=high
+
+ * gfx/src/gtk/fontEncoding.properties: Uncomment symbol fonts. (Closes:
+ #272927)
+ * debian/control: Build-depend on binutils (>= 2.15-4) but only on mips
+ and mipsel. (Closes: #273353)
+ * configure.in, configure, rules.mk: Patch from Thiemo Seufer to
+ increase stability and performance on mips. (Closes: #272159)
+ * debian/mozilla-firefox-runner: Detect failure of ping()
+ better. (Closes: #267393)
+ * layout/html/document/src/html.css: Testing fix for xprint problems.
+
+ -- Eric Dorland <eric@debian.org> Mon, 27 Sep 2004 17:07:37 -0400
+
+mozilla-firefox (0.9.3-5) unstable; urgency=high
+
+ * debian/update-mozilla-firefox-chrome: Apply another patch form Mike
+ Hommey to fix a few more issues in the script. (Closes: #271480)
+ * Fixes to Secunia security bugs, ported from bugzilla:
+ (Closes: #271888)
+ - browser/base/content/browser.js,
+ xpfe/communicator/resources/content/contentAreaDD.js: Fix for
+ drag and drop exploit, bz#250862.
+ - caps/include/nsScriptSecurityManager.h, caps/src/caps.properties,
+ caps/src/nsScriptSecurityManager.cpp: Fix for enablePrivilege
+ exploit, bz#253942.
+ - gfx/src/shared/gfxImageFrame.cpp, gfx/src/windows/nsImageWin.cpp,
+ modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp: Fix for various
+ overflows in the BMP code, bz#255067.
+ - netwerk/dns/src/nsIDNService.cpp: Fix for bug in non-ASCII
+ characters in domain names, bz#256316
+ - content/xbl/src/nsXBLPrototypeHandler.cpp: Clipboard injection
+ fix, bz#257523.
+
+ -- Eric Dorland <eric@debian.org> Thu, 16 Sep 2004 20:06:47 -0400
+
+mozilla-firefox (0.9.3-4) unstable; urgency=high
+
+ * Urgency high, go into testing dammit!
+ * Apply patch from Mike Hommey as -3.1, which wasn't actually
+ released. See below. (Closes: #271480)
+ * debian/rules: Patch from Matthew Mueller to fix underquoted
+ argument. (Closes: #271432)
+ * debian/control: Build depend on binutils (>= 2.15-3) with fixed mips
+ support. We still need a fixed gcc.
+
+ -- Eric Dorland <eric@debian.org> Mon, 13 Sep 2004 20:41:27 -0400
+
+mozilla-firefox (0.9.3-3.1) unstable; urgency=low
+
+ * debian/rules: removed
+ /usr/lib/mozilla-firefox/defaults/profile/extensions/installed-extensions.txt
+ * debian/update-mozilla-firefox-chrome:
+ + Added a "verbose" mode.
+ + Added warning messages (only shown in verbose mode) about some
+ extensions specific issues. This is intended to be useful for extensions
+ maintainers.
+ + Check if the installed-extensions.txt file disappears, which tells if the
+ mozilla-firefox -register went ok.
+ * debian/update-mozilla-firefox-chrome.8:
+ + Fixed typos.
+ + Added reference to the -v option for the verbose mode.
+ * debian/mozilla-firefox-runner: enhanced the profile directory check. It
+ didn't work if the path indicated in the profiles.ini was not absolute.
+
+ -- Mike Hommey <mh@glandium.org> Mon, 13 Sep 2004 20:31:21 +0900
+
+mozilla-firefox (0.9.3-3) unstable; urgency=high
+
+ * Acknowlege NMU from Mike Hommey. He did a fantastic job in porting a
+ large amount of fixes from upstream CVS. I owe him several large
+ beverages of his choice. (Closes: #259046, #259836)
+ * Port all of Mike's changes to my local CVS.
+ * debian/mozilla-firefox-runner:
+ - Pass command-line arguments to get_locale so they can actually
+ be used. (Closes: #240058)
+ - Apply patch from Mike Hommey to use the profiles.ini to find the
+ path to the profile to clean XUL.mfasl. (Closes: #267326)
+ * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to fix
+ some bashisms introduced by his NMU.
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in,
+ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s,
+ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4,
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Patch from
+ Thiemo Seufer to fix mips. This requires patches to gcc and binutils
+ to work and fully close #270621.
+
+ -- Eric Dorland <eric@debian.org> Wed, 8 Sep 2004 21:13:35 -0400
+
+mozilla-firefox (0.9.3-2.2) unstable; urgency=high
+
+ * The "never edit the diff file unless you're sure nothing will be
+ missing" release.
+ * debian/mozilla-firefox.prerm: restore the uncut version.
+ * debian/control, debian/rules: Use gcc-3.2 to build on hppa, because of
+ toolchain bug #254549.
+
+ -- Mike Hommey <mh@glandium.org> Mon, 23 Aug 2004 19:45:54 +0900
+
+mozilla-firefox (0.9.3-2.1) unstable; urgency=high
+
+ * Non Maintainer Upload for RC Fixes.
+ * Applied changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+ and toolkit/mozapps/extensions/locale/extensions.properties to solve some
+ issues with extensions management. (taken from CVS)
+ * Applied other changes to
+ toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+ toolkit/mozapps/extensions/public/nsIExtensionManager.idl and
+ mozilla/toolkit/xre/nsAppRunner.cpp to be able to use -register
+ instead of -list-global-items for extensions/components/chrome
+ registration through update-mozilla-firefox-chrome, thus not needing
+ Xvfb anymore (-register option doesn't require a X server).
+ (taken from CVS)
+ * Applied some more changes to
+ toolkit/mozapps/extensions/src/nsExtensionManager.js.in in order to
+ avoir overlayinfo deletion during extensions registration process.
+ (taken from CVS)
+ * Final changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+ to avoid registering out of date extensions so that firefox doesn't enter
+ a loop at startup when no profile was found, and to only write in the
+ installed-extensions-processed.txt file the list of actually installed
+ extensions. Note that for packaged extensions installing their files
+ directly into the chrome or components directories, that only means they
+ won't appear in the Extensions Manager. They will still be available in
+ the GUI.
+ * All these fixes improve the Extensions Manager. Closes: #259046.
+ * accessible/src/atk/nsAccessibleWrap.cpp,
+ accessible/src/atk/nsAccessibleWrap.h: fixed 32-bit abuse of gobject
+ (Steve Langasek). Closes: #259836.
+ * debian/control: Removed dependency upon xvfb.
+ * debian/update-mozilla-firefox-chrome:
+ + Removed use of Xvfb.
+ + Removed creation of a root default profile, but kept the fake home
+ hack to avoid creation of a .mozilla directory in root's home.
+ + Changed extensions handling so that the overall process is cleaner.
+ Extensions packages will have to move extensions {uid} directories
+ to /usr/lib/mozilla-firefox/extensions/, while the current location
+ is still supported for compatibility purpose (but is strongly not
+ recommended).
+ + Removed use of regxpcom and regchrome, since what they both do is
+ done by firefox-bin -register.
+ * debian/rules: force GnomeVFS support to be disabled. (Josselin Mouette)
+ * debian/README.Debian:
+ + Added a note about potential problems with packaged "old" extensions.
+ + Added a note about how to manually disable packaged extensions in user
+ profile.
+ + Removed some old notes that don't apply anymore.
+ * debian/mozilla-firefox-dom-inspector.install, debian/rules: Move
+ extensions files to /usr/lib/mozilla-firefox/extensions/ instead of
+ /usr/lib/mozilla-firefox/defaults/profile/extensions/.
+ * debian/mozilla-firefox.links: Move installed-extensions.txt symlink
+ from /usr/lib/mozilla-firefox/defaults/profile/extensions/ to
+ /usr/lib/mozilla-firefox/extensions/.
+ * debian/mozilla-firefox.prerm: More cleanup on removal of package.
+
+ -- Mike Hommey <mh@glandium.org> Sun, 22 Aug 2004 21:43:47 +0900
+
+mozilla-firefox (0.9.3-2) unstable; urgency=low
+
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Comment out
+ NARGSAVE, like I did in 0.9.1-7, should fully fix #262571.
+ * debian/mozilla-firefox.preinst: Remove brace expansion
+ bashism. (Closes: #264200)
+ * debian/control: Depend on debianutils (>= 1.16) since we use mktemp
+ -d. (Closes: #263958)
+ * debian/mozilla-firefox-runner: Make -contentLocale COUNTRY, not
+ lang-COUNTRY. (Closes: #263940)
+
+ -- Eric Dorland <eric@debian.org> Sun, 8 Aug 2004 23:41:02 -0400
+
+mozilla-firefox (0.9.3-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #263193)
+ * debian/update-mozilla-firefox-chrome.8: Add manpage from Mark Suter
+ for update-mozilla-firefox-chrome.8. (Closes: #263149)
+ * debian/mozilla-firefox.manpages: Add update-mozilla-firefox-chrome.8.
+ * debian/control: Add build-deps on gcc-3.4 for amd64. (Closes: #262679)
+
+ -- Eric Dorland <eric@debian.org> Wed, 4 Aug 2004 20:21:22 -0400
+
+mozilla-firefox (0.9.1-7) unstable; urgency=low
+
+ * debian/mozilla-firefox-runner:
+ - Reintroduce check for command-line arguments (I broke this last
+ release). (Closes: #262692, #262462, #262537, #262588, #262727)
+ - Allow overriding of -contentLocale and -UILocale. (Closes:
+ #240058)
+ * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s: Comment out
+ NARGSAVE reassignment, it is defined elsewhere. (Closes: #262571)
+ * debian/rules: Force amd64 to build with gcc 3.4. (Closes: #262679)
+
+ -- Eric Dorland <eric@debian.org> Mon, 2 Aug 2004 10:16:46 -0400
+
+mozilla-firefox (0.9.1-6) unstable; urgency=low
+
+ * widget/src/gtk2/keysym2ucs.c: Patch from Eugeniy Meshcheryakov to
+ allow mozilla firefox to enter a ghe with upturn. (Closes: #261543)
+ * debian/mozilla-firefox-runner:
+ - Remove some mail and composer cruft.
+ - Add warning if DISPLAY is not set. (Closes: #261465)
+
+ -- Eric Dorland <eric@debian.org> Thu, 29 Jul 2004 22:49:59 -0400
+
+mozilla-firefox (0.9.1-5) unstable; urgency=low
+
+ * debian/control: Goodbye mozilla-firebird transition package.
+ * debian/mozilla-firefox-runner: Add -a firefox flag when running
+ firefox-bin. (Closes: #259237)
+ * debian/mozilla-firefox.desktop: Add GenericName field.
+ * debian/update-mozilla-firefox-chrome: Fix quoting problem with
+ {*}. (Closes: #257243)
+ * debian/rules:
+ - Re-enable postscript printing support, since the security
+ issues turned out to be bogus. (Closes: #257628)
+ - Disable SVG support, it's still too broken to be usable.
+ (Closes: #259544)
+
+ -- Eric Dorland <eric@debian.org> Sun, 18 Jul 2004 20:09:14 -0400
+
+mozilla-firefox (0.9.1-4) unstable; urgency=low
+
+ * The "Let's try unstable" release. There are still issues, but there
+ are issues with 0.8 as well, so no more point in waiting.
+ * debian/update-mozilla-firefox-chrome:
+ - Copy over empty Extensions.rdf file on update. (Closes: #257243)
+ - Increase sleep to 15 seconds, hopefully this will work on most
+ people's machines.
+ * My apologies to Mike Hommey for mispelling his name in last release.
+
+ -- Eric Dorland <eric@debian.org> Sun, 11 Jul 2004 23:51:24 -0400
+
+mozilla-firefox (0.9.1-3) experimental; urgency=low
+
+ * Ok, I was wrong, we're still in experimental. I think we need to fix a
+ few more issues before getting this in unstable, like #257258, and
+ make sure the hacky extensions mechanism is more bullet-proof.
+ * debian/rules: --disable-installer, since we don't use it.
+ * debian/update-mozilla-firefox-chrome:
+ - Wait 8 seconds instead of 5 for the hack, might help some
+ people reporting problems.
+ - Remove ${LIBDIR}/extensions/{*}. I may move that to
+ /var/lib/mozilla-firefox eventually, but let's leave it for now.
+ * debian/mozilla-firefox.png.uu: Make a nicer png icon, based on the
+ about box graphic.
+ * debian/mozilla-firefox.preinst: Remove old config files in
+ /etc/mozilla-firefox/pref. (Closes: #257711, 257557)
+ * browser/app/profile: firefox.js: Revert change to app.version,
+ apparently it breaks extensions. (Closes: #257941)
+
+ -- Eric Dorland <eric@debian.org> Wed, 7 Jul 2004 21:26:55 -0400
+
+mozilla-firefox (0.9.1-2) experimental; urgency=low
+
+ * The "Mike Homey, lord of the bugs" release. Thanks to Mike for being a
+ huge help with bug triage. That's right, help with bugs and your name
+ could have a prestigious place in the changelog.
+ * I'd like my next release to be to unstable, so let me know about
+ profile transition bugs, etc.
+ * debian/control: Build-depend on libcairo1-dev.
+ * debian/rules: Enable svg support using cairo renderer. (Closes:
+ #215990)
+ * debian/mozilla-firefox-xremote-client: Add -a firefox switch to make
+ the remote client find firefox only. Thanks Jonathan Black. (Closes:
+ #256967)
+ * debian/mozilla-firefox.desktop: Make comment Gnome HIG
+ compliant. (Closes: #257592)
+ * browser/app/profile/firefox.js:
+ - app.version = 0.9.1.
+ - Disable app updates by default. We're debian, we handle updates.
+ * debian/update-mozilla-firefox-chrome:
+ - Remove installed-extensions-processed.txt before regenerating.
+ (Closes: #257243)
+ - Take some, but not all advice from Alexandru Fomin. Improve Xvfb
+ and extension registration hacks.
+
+ -- Eric Dorland <eric@debian.org> Sun, 4 Jul 2004 16:58:17 -0400
+
+mozilla-firefox (0.9.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * config/autoconf.mk.in: Alright, /usr/lib/firefox-0.9 was a bad idea,
+ use /usr/lib/mozilla-firefox. Change all the instances
+ /usr/lib/firefox-0.9 back to /usr/lib/mozilla-firefox. I feel
+ silly. (Closes: #256991)
+ * debian/mozilla-firefox-runner: Actually check for the existence of the
+ .mozilla/firefox directory before trying to clean it.
+ * debian/update-mozilla-firefox-runner:
+ - Call firefox-bin, not firefox you silly goose.
+ - Use mozilla-firefox tempfile, not mozilla-browser.
+ - The horrible hackiness continues: For my previous hack to work,
+ I need to preseed a profile directory in the home directory I
+ create. Now things should work. (Closes: #256812)
+
+ -- Eric Dorland <eric@debian.org> Thu, 1 Jul 2004 17:16:29 -0400
+
+mozilla-firefox (0.9-1) experimental; urgency=low
+
+ * New upstream release. There may be regressions from 0.8. (Closes:
+ #254522)
+ * widget/src/gtk/nsGtkMozRemoteHelper.cpp,
+ widget/src/gtk2/nsGtkMozRemoteHelper.cpp,
+ widget/src/xremoteclient/XRemoteClient.cpp: Fix previously applied to
+ fix -remote behaviour undone. Mozilla now includes the program name in
+ the properties to distinguish between various Mozilla apps.
+ * xpcom/reflect/xptcall/src/md/unix/Makefile.in: remove extra endif.
+ * dom/public/idl/core/nsIDOMNSDocument.idl: Reintroduce referrer
+ attribute that got lost somehow.
+ * content/events/src/nsEventStateManager.cpp: Fix a strange broken
+ function call to GetContainer.
+
+ * debian/rules:
+ - Follow upstream and --enable-single-profile and
+ --disable-profilesharing.
+ - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+ - --user-app-dir=.mozilla to jive with new location.
+ - Remove dom-inspector extension dir from the regular package.
+ * debian/control: Depend on xvfb for insane hack below.
+ * debian/mozilla-firefox.install:
+ - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+ - Remove ipc dir, mozipcd.
+ - Add init.d, greprefs dirs.
+ * debian/mozilla-firefox.dirs:
+ - Add /var/lib/mozilla-firefox/extensions{,.d}
+ * debian/mozilla-firefox-dom-inspector.dirs: Add
+ /var/lib/mozilla-firefox/extensions.d.
+ * debian/mozilla-firefox-dom-inspector.install:
+ - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+ - Install dom-inspector extension dir.
+ * debian/mozilla-firefox.links:
+ - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+ - Link /usr/lib/mozilla-firefox to /usr/lib/firefox-0.9.
+ - Link installed-extensions.txt to our place in
+ /var/lib/mozilla-firefox.
+ * debian/mozilla-firefox-runner:
+ - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+ - Fix xprintorg typo. (Closes: #255706)
+ - Search .mozilla/firefox for XUL.mfasl files.
+ * debian/mozilla-firefox-xremote-client: Replace
+ /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+ * debian/update-mozilla-firefox-chrome:
+ - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+ - Capture return values from reg* commands on error, stolen
+ from mozilla source.
+ - Remove returns from check_running.
+ - Pull in snippets from /var/lib/mozilla-firefox/extensions.d
+ to generate installed-extensions.txt for new extensions mechanism.
+ - An insane hack, but necessary because of upstream: Launch a Xvfb
+ to run firefox to generate the necessary extension metadata. I've
+ been told this will not be necessary in the next version.
+
+ -- Eric Dorland <eric@debian.org> Mon, 28 Jun 2004 23:40:59 -0400
+
+mozilla-firefox (0.8-12) unstable; urgency=low
+
+ * The "Last Chance Before 0.9" release.
+ * debian/mozilla-firefox-runner: Fix unescaped \n, thanks Olly
+ Betts. (Closes: #252436)
+ * debian/update-mozilla-firefox-chrome: Watch out for empty
+ LD_LIBRARY_PATH. Thanks George Cristian Birzan. (Closes: #254142)
+ * debian/README.Debian: Restructure and update a bit.
+ * debian/presubj: Add bug information from README.Debian for reportbug.
+ * debian/mozilla-firefox.install: Install the presubj.
+
+ -- Eric Dorland <eric@debian.org> Mon, 14 Jun 2004 19:39:27 -0400
+
+mozilla-firefox (0.8-11) unstable; urgency=low
+
+ * Apply amd64 fix from #249211.
+ * debian/README.Debian: Shamelessly stole the java plugin installation
+ instructions from the mozilla package. (Closes: #243513)
+ * nsCommonWidget.cpp, nsCommonWidget.h, nsWindow.cpp: Apply patch (with
+ some hand massaging) from upstream bugzilla bug #209342 to fix initial
+ window placement. (Closes: #235209, 241519)
+ * nsprpub/pr/src/misc/prnetdb.c: Apply patch from Miquel van Smoorenburg
+ to prevent unless reverse DNS lookups. (Closes: #251978)
+ * debian/mozilla-firefox-runner: Apply patch from Jasper Spaans to fix
+ remote xprint printing. (Closes: #252072)
+
+ -- Eric Dorland <eric@debian.org> Tue, 1 Jun 2004 23:12:36 -0400
+
+mozilla-firefox (0.8-10) unstable; urgency=low
+
+ * debian/mozilla-firefox.install: Don't install uuencoded file. (Closes:
+ #251441)
+ * debian/mozilla-firefox-runner: unset AUDIODEV which can cause
+ crashes. Thanks Christopher Armstrong. (Closes: #236231)
+ * update-mozilla-firefox-chrome: Port security fix from #249613 to
+ handle insecure tempfile creation.
+ * debian/rules: Following the advice of #247585 I'm disabling postscript
+ printing. Perhaps this will alleviate some of the other printing
+ problems.
+
+ -- Eric Dorland <eric@debian.org> Sun, 30 May 2004 01:47:52 -0400
+
+mozilla-firefox (0.8-9) unstable; urgency=low
+
+ * debian/control:
+ - Suggest latex-xft-fonts for MathML fonts. Thanks Michael
+ JasonSmith. (Closes: #216925)
+ - Build depend on libx11-dev & libxp-dev instead of xlibs-dev to
+ reflect new X packages.
+ * widget/src/gtk2/nsWindow.cpp: Apply patch from Peter Colberg to ignore
+ unused mouse buttons. (Closes: #244305)
+ * debian/README.Debian: Document the fact that the loopback interface
+ has to be up and unfiltered for things to work right.
+
+ -- Eric Dorland <eric@debian.org> Wed, 5 May 2004 23:30:42 -0400
+
+mozilla-firefox (0.8-8) unstable; urgency=low
+
+ * security/nss/lib/freebl/unix_rand.c: Remove code that called netstat
+ to gain so entropy. It's pretty useless on a Linux system. Thanks
+ Wichert. (Closes: #241200)
+ * debian/README.Debian: Add note about changing the button order in the
+ dialog boxes. (Closes: #240261)
+ * debian/control: Add dummy package for mozilla-firebird to smooth
+ upgrades. (Closes: #235577)
+
+ -- Eric Dorland <eric@debian.org> Sat, 3 Apr 2004 16:19:34 -0500
+
+mozilla-firefox (0.8-7) unstable; urgency=low
+
+ * debian/mozilla-firefox-runner:
+ - Cleanup XUL.mfasl whenever firefox is run with no
+ command-line. (Closes: #238717)
+ - Add patch from Laurent Buffler to add config to allow
+ new tabs to be opened instead of new windows. (Closes: #239323)
+ * debian/mozilla-firefoxrc: Put the new FIREFOX_OPEN_IN variable in
+ there and document it's use.
+
+ -- Eric Dorland <eric@debian.org> Sat, 27 Mar 2004 17:21:51 -0500
+
+mozilla-firefox (0.8-6) unstable; urgency=low
+
+ * debian/control: Build-depend on g++-3.3 (>= 3.3.3-4) to work around
+ broken 3.3.3-3 release. (Closes: #238318, #238241, #238441, #238523,
+ #238534)
+ * debian/rules: Install new small-firefox icon.
+ * debian/mozilla-firefox{.png, .xpm, -small.xpm}: Use the new DFSG-free
+ icons, the old pretty ones are trademarked and not DSFG-free. I know,
+ it's stupid. Complain to the Mozilla Foundation, not me. (Closes:
+ #234869)
+
+ -- Eric Dorland <eric@debian.org> Sun, 21 Mar 2004 22:09:16 -0500
+
+mozilla-firefox (0.8-5) unstable; urgency=low
+
+ * Rebuild with g++-3.3 3.3.3-2 to work around broken g++. (Closes:
+ #238318)
+
+ -- Eric Dorland <eric@debian.org> Wed, 17 Mar 2004 21:38:58 -0500
+
+mozilla-firefox (0.8-4) unstable; urgency=low
+
+ * debian/README.Debian:
+ - Tell people not to remove their ~/.firefox directory. Just move it
+ out of the way. (Closes: #235594)
+ - Add notes about the sound dsp. (Closes: #236678)
+ * debian/mozilla-firefox-runner:
+ - Don't redirect stderr. (Closes: #236160)
+ - Add get_locale code from Aurelien Jarno (Closes: #235521)
+ - Fix dsp auto-detection code. (Closes: #236678)
+ * debian/rules: Add default locale file.
+ * debian/mozilla-firefox.dirs: Add locales dir.
+
+ * browser/app/profile/all.js,
+ content/events/src/nsEventStateManager.cpp,
+ modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h,
+ widget/src/gtk/nsWidget.cpp: Reapply extended mouse events patch from
+ Derek Upham. (Closes: #235385, #230876)
+ * browser/base/content/browser-sets.inc: Make ESC stop animations
+ again. (Closes: #235474)
+
+ -- Eric Dorland <eric@debian.org> Tue, 16 Mar 2004 00:31:19 -0500
+
+mozilla-firefox (0.8-3) unstable; urgency=low
+
+ * debian/mozilla.firefox.menu: Change the case of
+ mozilla-Firefox. (Closes: #234982, #234755)
+ * debian/NEWS.Debian: Move to debian/mozilla-firefox.NEWS so that it
+ actually gets installed. (Closes: #234700)
+ * debian/update-mozilla-firefox-chrome: Setup dummy home directory to
+ capture silly .firefox directory. (Closes: #234855)
+ * debian/mozilla-firefox.png.uu, debian/mozilla-firefox.xpm: Use the
+ new, pretty mozilla-firefox icons. (Closes: #234869)
+ * debian/rules: Install the pretty icon in the right places.
+
+ -- Eric Dorland <eric@debian.org> Thu, 26 Feb 2004 21:10:27 -0500
+
+mozilla-firefox (0.8-2) unstable; urgency=low
+
+ * The "what he taketh, he giveth back" release.
+ * debian/rules:
+ - Disable the wallet extension, this really closes: #222447.
+ - Remove some more cruft left over from the patch system.
+ - Reinstall the dom-inspector.
+ * debian/control: Add the dom-inspector back, now that it is supported
+ upstream.
+ * debian/mozilla-firefox-dom-inspector.{install,dirs,postinst,postrm}:
+ Bring these files back.
+ * docshell/base/nsWebShell.cpp: Only do keyword lookup on when DNS
+ entries don't exist. (Closes: #233916, #218033, #211524)
+
+ -- Eric Dorland <eric@debian.org> Mon, 23 Feb 2004 21:48:03 -0500
+
+mozilla-firefox (0.8-1) unstable; urgency=low
+
+ * The "Let's Change Our Name Every Other Day" release.
+ * New upstream release, mozilla-firebird has been renamed to
+ mozilla-firefox. Let's hope it lasts. (Closes: #231903, #222447)
+ * debian/mozilla-firebird.*: Renamed to debian/mozilla-firefox.*.
+
+ * debian/README.Debian: Update for firefox, remove blurb about the
+ inspector.
+ * debian/NEWS.Debian: Explain how to move your configs over. I may make
+ this automatic if enough people complain, but I'm loathe to muck
+ around in pople's home directories.
+
+ * debian/control:
+ - Rename the package.
+ - Tweak description to list Firefox's previous aliases.
+ - Remove conflicts on mozilla-firebird-dom-inspector.
+
+ * debian/rules:
+ - s/firebird/firefox/g, s/MozillaFirebird/firebird/g.
+ - Comment out some old inspector code.
+ - Remove unused patch subsystem.
+ - Disable gtktest. We don't need no stinking tests.
+ - Remove disable plaintext editor line, not sure why it's there.
+ - Disable LDAP support. We don't use it.
+ - Remove executable bit on *.so files.
+ - Remove useless preference files.
+ - Exclude the inspector files.
+ - Don't remove installed-chrome, we don't install it anymore.
+ - user-app-dir = .firefox. (Closes: #212301)
+ - export MOZILLA_OFFICIAL for the build ID. (Closes: #231133)
+
+ * debian/mozilla-firefox-runner:
+ - s/firebird/firefox/g.
+ - Remove composer and editor functions.
+ - Use .firefox directory.
+
+ * debian/mozilla-firefox.install:
+ - s/firebird/firefox/g, s/MozillaFirebird/firefox/g.
+ - Don't install timebombgen.
+ - Install icons directory.
+ - Don't install installed-chrome.txt, we just remove it anyway.
+
+ * debian/mozilla-firefox.desktop, debian/mozilla-firefox.dirs,
+ debian/mozilla-firefox.manpages, debian/mozilla-firefox.links,
+ debian/mozilla-firefox.menu, debian/mozilla-firefox.mime,
+ debian/mozilla-firefoxrc, debian/mozilla-firefox.postinst,
+ debian/mozilla-firefox.prerm, debian/update-mozilla-firefox-chrome,
+ debian/mozilla-firefox.1, debian/mozilla-firefox-xremote-client:
+ s/firebird/firefox/g, s/MozillaFirebird/firefox/g.
+
+ * debian/mozilla-firefox.links: Link mozilla-firefox.1 to firefox.1.
+
+ * debian/mozilla-firefox.preinst: Remove, at least with the rename I can
+ erase some of my previous blunders.
+
+ * debian/mozilla-firefox.{png.uu,xpm}: Use the package icon.
+
+ * browser/app/nsBrowserApp.cpp: Change package name to Firefox, so now
+ the ~/.firefox is used. (Closes: #196550)
+
+ * browser/app/profile/all.js: Merge in autoscroll fixes.
+ * browser/base/content/browser-sets.inc: Merge in upstream stop button
+ fix.
+ * modules/plugin/samples/default/unix/nullplugin.c: Merge in removal of
+ commented code.
+ * nsprpub/pr/include/md/_linux.cfg, nsprpub/pr/include/md/_linux.h,
+ security/coreconf/Linux.mk: Merge in hppa build fixes from upstream.
+ * config/autoconf.mk.in: Install into /usr/lib/mozilla-firefox now.
+ * content/base/src/nsDocumentViewer.cpp: Remove redundant stop patch
+ since it has been merged upstream.
+ * content/events/src/nsEventStateManager.cpp,
+ modules/libpref/src/init/all.js, widget/src/gtk/nsWidget.cpp: Revert
+ back to upstream version. There was a patch here to add support for
+ extended mouse buttons, but I'm removing it since I don't trust that
+ it works in the new version correctly. Send me another patch if you
+ want this functionality back.
+ * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Revert this
+ back to upstream, I'm not sure which patches I applied to this file,
+ likely something to try and fix the double password prompt.
+ * widget/src/xremoteclient/XRemoteClient.cpp,
+ widget/src/xremoteclient/XRemoteClient.h: Revert to upstream version,
+ I believe it does the right thing now, but the patch I used does not
+ apppear to have been used. Restore the properties to _FIREFOX_*
+ though.
+ * widget/src/gtk/nsGtkMozRemoteHelper.cpp,
+ widget/src/gtk2/nsGtkMozRemoteHelper.cpp: Change the _FIREBIRD_* to
+ _FIREFOX_* here as well.
+ * content/base/src/nsDocument.cpp: Comment out nsDocument::GetDomConfig,
+ needed to get things to compile.
+
+ -- Eric Dorland <eric@debian.org> Sun, 15 Feb 2004 21:28:45 -0500
+
+mozilla-firebird (0.7-7) unstable; urgency=low
+
+ * debian/mozilla-firebird-runner: Open a new window when loading a
+ regular file. (Closes: #228853)
+
+ -- Eric Dorland <eric@debian.org> Thu, 29 Jan 2004 22:12:30 -0500
+
+mozilla-firebird (0.7-6) unstable; urgency=medium
+
+ * The "Indian-giver-christmas" release.
+ * Urgency medium since we're closing some critical bugs that need to get
+ in before a freeze.
+ * Completely remove mozilla-firebird-dom-browser. No one stepped up to
+ help fix it's brokeness in 0.7 and I don't use it or particularly care
+ about it. So it is no more. If someone steps up to take responsibility
+ I might put it back, but otherwise it may RIP. (Closes: #222085)
+ * debian/mozilla-firebird-runner: Remove XUL.mfasl uncoditionally
+ now. There is a corner case where this file is corrupted on upgrade
+ when firebird was running. This is a total hack, and not an elegant
+ solution, but at least it fixes the problem. (Closes: #224779,
+ #224323)
+ * debian/control: Conflict against old mozilla-firebird-dom-inspector
+ since it doesn't work anymore.
+
+ -- Eric Dorland <eric@debian.org> Thu, 25 Dec 2003 15:54:21 -0500
+
+mozilla-firebird (0.7-5) unstable; urgency=low
+
+ * browser/base/content/browser-sets.inc: Patch to make ESC stop actually
+ work. (Closes: #223382)
+ * debian/rules: Turn down optimizations on sparc. (Closes: #223760)
+
+ -- Eric Dorland <eric@debian.org> Sun, 14 Dec 2003 23:01:59 -0500
+
+mozilla-firebird (0.7-4) unstable; urgency=low
+
+ * The "All of Takuo's hard work really pays off" release.
+ * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Patch from
+ upstream bugzilla (#220214) to fix double password prompt
+ problem. (Closes: #222696)
+ * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Stolen
+ patch from mozilla package to make mozilla-firebird build on
+ mips. (Closes: #222743)
+ * content/base/src/nsDocumentViewer.cpp: Port yet another patch to allow
+ the ESC key to stop animated gifs. (Closes: #223382)
+
+ -- Eric Dorland <eric@debian.org> Mon, 8 Dec 2003 23:59:16 -0500
+
+mozilla-firebird (0.7-3) unstable; urgency=low
+
+ * debian/control: Add dependency on psmisc since we use fuser. Thanks
+ Daniel Schröter.
+ * widget/src/xremoteclient/XRemoteClient.{cpp,h}: Apply patch from
+ bugzilla to fix -remote behaviour on modern WMs. Thanks Nikolai
+ Prokoschenko. (Closes: #197632)
+ * nsprpub/pr/src/misc/prdtoa.c: Apply fix from mozilla package (#215067)
+ to fix building on arm. This is a partial fix to #222743.
+ * debian/patches: Remove these. Put everything in CVS.
+
+ -- Eric Dorland <eric@debian.org> Fri, 5 Dec 2003 20:03:46 -0500
+
+mozilla-firebird (0.7-2) unstable; urgency=low
+
+ * Apply excellent patch from Alexander Sack <asac@jwsdot.com> to fix the
+ issues with mozilla running and firebird not starting. (Closes:
+ #216264)
+ * browser/app/profile/all.js: Set the default of "general.autoScroll" to
+ false because it annoyes me. (Closes: #221661)
+
+ -- Eric Dorland <eric@debian.org> Wed, 19 Nov 2003 20:59:55 -0500
+
+mozilla-firebird (0.7-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #216019)
+ * debian/patches/dom-inspector.diff: Remove, and apply directly into my
+ CVS.
+ * debian/patches/pref.diff: Removed, doesn't seem applicable anymore.
+ * debian/rules: export MOZ_FIREBIRD=1.
+ * debian/control:
+ - Change Chimera to Camino. (Closes: #220821)
+ - Fix typos in descriptions. (Closes: #218202)
+ - Add build-deps on m4. (Closes: #219681)
+
+ -- Eric Dorland <eric@debian.org> Wed, 12 Nov 2003 23:01:35 -0500
+
+mozilla-firebird (0.6.1-8) unstable; urgency=low
+
+ * Apply patch to make forward and back buttons work on mice. (Closes:
+ #211606)
+ * debian/rules: Use -O optimization on alpha, so it will build
+ again. (Closes: #213603)
+
+ -- Eric Dorland <eric@debian.org> Fri, 3 Oct 2003 00:07:44 -0400
+
+mozilla-firebird (0.6.1-7) unstable; urgency=low
+
+ * Rebuild with the latest and greatest from unstable. This seems to fix
+ the problems with bookmarks people were having, at least for me. No
+ idea why. Please reopen if this doesn't fix it for you. (Closes:
+ #209339, #211706, #211286, #211146, #212011)
+
+ -- Eric Dorland <eric@debian.org> Mon, 22 Sep 2003 00:00:08 -0400
+
+mozilla-firebird (0.6.1-6) unstable; urgency=low
+
+ * Patch from Eric Wong <normalperson@yhbt.net> to make plugin requests
+ less annoying. (Closes: #196609)
+ * debian/rules: Stop building libart.
+ * debian/mozilla-firebird.links: Fix path to bookmarks file. (Partial
+ fix to #211286)
+
+ -- Eric Dorland <eric@debian.org> Wed, 17 Sep 2003 20:22:56 -0400
+
+mozilla-firebird (0.6.1-5) unstable; urgency=low
+
+ * The "sorry Chris Gray" release.
+ * debian/rules: disable SVG. This was causing drag and drop to lock up
+ X and possibly fixes #208630. (Closes: #209371)
+ * debian/mozilla-firebird-runner: Remove XUL.mfasl if we have upgraded,
+ since it can cause problems. (Closes: #200073, #202130, #207351)
+
+ -- Eric Dorland <eric@debian.org> Sat, 13 Sep 2003 20:15:37 -0400
+
+mozilla-firebird (0.6.1-4) unstable; urgency=low
+
+ * The "pleasing Chris Gray" release.
+ * other-licenses/libart_gpl: Add this library for svg.
+ * debian/rules:
+ - Enable svg.
+ - Move bookmarks.html file into /etc. (Closes: #207398)
+ * debian/mozilla-firebird.links: Add links back to files moved to /etc.
+ * security/coreconf/Linux2.6.mk: Add this as a copy of Linux2.5.mk to
+ get mozilla-firebird to build on 2.6. (Closes: #207821)
+
+ -- Eric Dorland <eric@debian.org> Sun, 31 Aug 2003 04:40:30 -0400
+
+mozilla-firebird (0.6.1-3) unstable; urgency=low
+
+ * debian/mozilla-firebird.prerm: Remove mozilla alternative on
+ remove. (Closes: #205310)
+ * debian/debsearch.{gif.uu,src}: Debian search plugin graciously
+ contributed by Fergus McKenzie-Kay <Linux@NerdIT.com>.
+ * debian/rules:
+ - uudecode and clean up debsearch.gif.uu.
+ - Steal platform specific optimization code from mozilla
+ package. Thanks Brian Nelson. (Closes: #206309)
+ * debian/mozilla-firebird.install: Install the above files.
+ * debian/control: Update Standards-Version to 3.6.1.
+
+ -- Eric Dorland <eric@debian.org> Sun, 24 Aug 2003 19:09:11 -0400
+
+mozilla-firebird (0.6.1-2) unstable; urgency=low
+
+ * The "Stop Pestering Me Already!" release.
+ * debian/control: Only recommend xprt-xprintorg, don't require
+ it. (Closes: #204176)
+
+ -- Eric Dorland <eric@debian.org> Sun, 10 Aug 2003 20:00:11 -0400
+
+mozilla-firebird (0.6.1-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #203518, #201203)
+ * debian/control:
+ - Standards-Version to 3.6.0.
+ - Don't provide www-browser anymore. (Closes: #201035)
+ - Depend on xprt-xprintorg so printing will work. (Closes: #202418)
+ * debian/mozilla-firebird.preinst: Remove www-browser alternative.
+ * debian/mozilla-firebird.postinst: Don't install www-browser alternative.
+ * debian/mozilla-firebird.prerm: Don't remove www-browser alternative
+ anymore.
+ * debian/README.Debian: Added note about configuration breaking on
+ upgrade. (Closes: #202130)
+ * debian/patches/classic.diff: Removed. Not sure what it's point was.
+ * debian/rules: Add --disable-pedantic to the configure options.
+
+ -- Eric Dorland <eric@debian.org> Sun, 3 Aug 2003 14:58:12 -0400
+
+mozilla-firebird (0.6-8) unstable; urgency=low
+
+ * debian/patches/alpha-build-fix.diff: Steal patch from mozilla to allow
+ building on alpha. (Closes: #198638)
+ * debian/patches/hppa-build-fix.diff: Steal patch from mozilla to allow
+ building on hppa, clean it up so it applies cleanly. (Closes: #199068)
+ * debian/mozilla-firebird.png.uu: Added uuencoded nice png icon.
+ * debian/rules: Add code to decode and clean up the new icon file.
+ * debian/mozilla-firebird.install: Install new icon.
+ * debian/mozilla-firebird.desktop: Use the new icon.
+
+ -- Eric Dorland <eric@debian.org> Fri, 27 Jun 2003 23:21:56 -0400
+
+mozilla-firebird (0.6-7) unstable; urgency=low
+
+ * debian/mozilla-firebird.1: Stole the mozilla manpage for my own
+ nefarious purposes. (Closes: #196638)
+ * debian/mozilla-firebird.postrm: Add slave links to the
+ mozilla-firebird manpage. (Closes: #197145)
+ * debian/mozilla-firebird-xremote-client: Set up the environment
+ properly so it returns correct information. (Closes: #197632)
+ * debian/mozilla-firebird.xpm: Added icon from
+ http://iconpacks.mozdev.org/phoenix/iconshots/flame48true.png to have
+ a nice menu icon. (Closes: #197565)
+ * Updated the README.Debian with some helpful bug reporting tips.
+ * debian/rules: Replaced dh_installmanpages with dh_installman.
+
+ -- Eric Dorland <eric@debian.org> Sun, 22 Jun 2003 15:15:37 -0400
+
+mozilla-firebird (0.6-6) unstable; urgency=low
+
+ * debian/mozilla-firebird.postinst: Add priority 0 alternative on
+ mozilla. (Closes: #196444)
+ * debian/control: Add build-depends on libxrender-dev, libmng-dev,
+ libpng12-dev, libjpeg62-dev.
+ * debian/rules:
+ - Build with system jpeg, mng and png libs.
+ - Exclude inspector files from mozilla-firebird.
+ (Closes: #196432, #196509)
+
+ -- Eric Dorland <eric@debian.org> Sat, 7 Jun 2003 15:19:23 -0400
+
+mozilla-firebird (0.6-5) unstable; urgency=low
+
+ * The "Mike Hommey is my homey" release.
+ * Thanks to Mike Hommey <mh@glandium.org> for his excellent work on this
+ version (it's 99% his), which I've shamelessly stolen.
+ * Added a README.Debian file.
+ * Added a separate mozilla-firebird-dom-inspector package.
+ * debian/patches/dom-inspector.diff:
+ - add DOM Inspector to Tools menu. (note: DOM Inspector is still
+ not very well integrated with Firebird)
+ - remove modern skin references.
+ * debian/patches/xpinstall.diff: remove unneeded chrome registrations
+ from xpinstall/packager/unix/browser.jst.
+ * debian/patches/classic.diff: remove
+ themes/classic/global/win/preview.gif from jar file and modify
+ preview image reference in rdf file to Preview.png.
+ * debian/patches/pref.diff: remove preview image constraints in
+ browser/components/prefwindow/skin/pref.css file to avoid deformation
+ of preview image in classic theme.
+ * debian/mozilla-firebird.preinst: added #DEBHELPER#.
+ * debian/mozilla-firebird.install:
+ - Don't install the modern.jar and embed-sample.jar files.
+ - Remove files related to dom-inspector.
+ * debian/rules:
+ - enabling xinerama support.
+ - disabling build of chatzilla and venkman.
+ - moved /var/lib/mozilla-firebird/chrome.d/99default to
+ /var/lib/mozilla-firebird/chrome.d/00all
+ - remove references to embed-sample.jar in
+ /var/lib/mozilla-firebird/chrome.d/00all
+ - Add some comments.
+ - Change == to =, for more strict /bin/sh's.
+ * debian/control: Build-Depend on libidl-dev (>= 0.8.0) because the
+ configure script requires at least this version.
+ * debian/copyright: Make this a real debian copyright file.
+
+ -- Eric Dorland <eric@debian.org> Thu, 5 Jun 2003 01:00:32 -0400
+
+mozilla-firebird (0.6-4) unstable; urgency=low
+
+ * debian/rules: Change -O2 to -O for building on powerpc.
+ * debian/mozilla-firebird.preinst: Delete
+ /usr/lib/mozilla-firebird/defaults/pref on upgrade to facilitate
+ transition to prefs in /etc. Thanks to all who reported this.
+
+ -- Eric Dorland <eric@debian.org> Tue, 27 May 2003 21:45:06 -0400
+
+mozilla-firebird (0.6-3) unstable; urgency=low
+
+ * First attempt at a debian upload. (Closes: #163270)
+ * debian/rules:
+ + Small fix to Mike Hommey's chrome patch.
+ + Suggestion from Bernhard R. Link to install
+ /usr/lib/mozilla-firebird/defaults/pref to
+ /etc/mozilla-firebird/pref
+ + Add dh_installmime call.
+ * debian/mozilla-firebird.mime: Install mime type handlers for firebird.
+ * debian/mozilla-firebird.links: Link
+ /usr/lib/mozilla-firebird/defaults/pref to /etc/mozilla-firebird/pref
+ * debian/mozilla-firebird.install: Don't install the inspector.jar.
+
+ -- Eric Dorland <eric@debian.org> Mon, 26 May 2003 00:28:40 -0400
+
+mozilla-firebird (0.6-2) unstable; urgency=low
+
+ * debian/rules:
+ + Add --with-user-appdir=.mozilla-firebird, since it still
+ defaults to .phoenix.
+ + Don't use the ${prefix} variable, use /usr, since ${prefix}
+ doesn't seem to work.
+ + Use --without-system-nspr.
+ * debian/mozilla-firebird.install:
+ + Be picky about what chrome files we install, since there's
+ quite a few we don't need, and a bunch of empty dirs.
+ * Excellent patch from Mike Hommey <mh@glandium.org> to add a
+ update-mozilla-firebird-chrome script.
+
+ -- Eric Dorland <eric@debian.org> Sat, 24 May 2003 13:00:44 -0400
+
+mozilla-firebird (0.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Renamed to mozilla-firebird.
+ * Changed phoenix to mozilla-firebird where appropriate.
+ * debian/mozilla-firebird.links: Add link mozilla-firebird to
+ MozillaFirebird.
+ * debian/control:
+ + Standars-Version to 3.5.10.0.
+ + Build-depend on gtk2 libs now.
+ + Build-depend on libidl-dev.
+ + Add Provides x-www-browser.
+ * debian/rules:
+ + Enable building with the gtk2 libs.
+ + Make mozilla-firebird-xremote-client executable in install target.
+ * debian/mozilla-firebird.desktop: Added gnome menu entry.
+ * debian/mozilla-firebird.{prerm,postinst}: Add alternatives to
+ www-browser and x-www-browser.
+
+ -- Eric Dorland <eric@debian.org> Mon, 19 May 2003 20:43:39 -0400
+
+phoenix (0.5-4) unstable; urgency=low
+
+ * debian/control: Depend on fontconfig.
+ * debian/rules: Add source-tarball-from-cvs to build a orig tarball from
+ a checked out cvs tree. Now I can provide source package. And there
+ was much rejoicing.
+
+ -- Eric Dorland <eric@debian.org> Fri, 17 Jan 2003 21:06:47 -0500
+
+phoenix (0.5-3) unstable; urgency=low
+
+ * debian/phoenix-xremote-client: Added to send remote commands to
+ phoenix. Just a wrapper that calls phoenix-bin -remote.
+ * debian/phoenix-runner:
+ + Use phoenix-xremote-client.
+ + Replace MOZILLA_DSP with PHOENIX_DSP.
+ * debian/phoenixrc: phoenix-runner uses this file to determine what dsp
+ to start.
+ * debian/phoenix.install:
+ + Install phoenix-xremote-client, and don't install
+ mozilla-xremote-client.
+ + Install phoenixrc.
+
+ -- Eric Dorland <eric@debian.org> Mon, 23 Dec 2002 02:52:21 -0500
+
+phoenix (0.5-2) unstable; urgency=low
+
+ * debian/control:
+ + Add Provides: www-browser.
+ + Build-depend on libxft2-dev, libnspr-dev.
+ * debian/rules:
+ + Use xft and the system nspr.
+ + Install phoenix-runner.
+ * debian/phoenix-runner: Stolen from the mozilla package to run phoenix.
+
+ -- Eric Dorland <eric@debian.org> Sat, 21 Dec 2002 02:03:11 -0500
+
+phoenix (0.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/phoenix.install: Fix paths to phoenix libs.
+ * debian/control:
+ + Standards-Version to 3.5.8
+ + Improve build-deps.
+ * debian/rules:
+ + Have configure options here, no more .mozconfig.
+ + Steal some patch code from Colin.
+ * debian/patches/mozappdir.diff: Change the mozappdir.
+
+ -- Eric Dorland <eric@debian.org> Mon, 9 Dec 2002 02:43:13 -0500
+
+phoenix (0.4-3) unstable; urgency=low
+
+ * debian/phoenix.menu: Add menu entry.
+ * Rebuild to fix libstdc++ dependency.
+ * .mozonfig: Disable more tests.
+
+ -- Eric Dorland <eric@debian.org> Wed, 20 Nov 2002 19:13:18 -0500
+
+phoenix (0.4-2) unstable; urgency=low
+
+ * debian/control:
+ + Add build-depends.
+ + Fix section and description.
+ * .mozconfig:
+ + Use system zlib.
+
+ -- Eric Dorland <eric@debian.org> Wed, 13 Nov 2002 19:03:52 -0500
+
+phoenix (0.4-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Eric Dorland <eric@debian.org> Mon, 11 Nov 2002 23:09:41 -0500
--- /dev/null
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Tue, 8 Sep 2020 17:00:48 +0000
+Subject: 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
+---
+ Cargo.lock | 8 +-
+ .../rust/proc-macro2/.cargo-checksum.json | 2 +-
+ third_party/rust/proc-macro2/Cargo.toml | 15 +-
+ third_party/rust/proc-macro2/README.md | 2 +-
+ third_party/rust/proc-macro2/build.rs | 12 +
+ third_party/rust/proc-macro2/src/detection.rs | 67 +
+ third_party/rust/proc-macro2/src/fallback.rs | 1004 ++----
+ third_party/rust/proc-macro2/src/lib.rs | 151 +-
+ third_party/rust/proc-macro2/src/parse.rs | 791 +++++
+ third_party/rust/proc-macro2/src/strnom.rs | 391 ---
+ third_party/rust/proc-macro2/src/wrapper.rs | 240 +-
+ .../rust/proc-macro2/tests/comments.rs | 103 +
+ third_party/rust/proc-macro2/tests/test.rs | 195 +-
+ .../rust/proc-macro2/tests/test_fmt.rs | 26 +
+ third_party/rust/syn/.cargo-checksum.json | 2 +-
+ third_party/rust/syn/Cargo.toml | 35 +-
+ third_party/rust/syn/README.md | 16 +-
+ third_party/rust/syn/benches/file.rs | 7 +
+ third_party/rust/syn/benches/rust.rs | 45 +-
+ third_party/rust/syn/build.rs | 38 +-
+ third_party/rust/syn/src/attr.rs | 126 +-
+ third_party/rust/syn/src/buffer.rs | 56 +-
+ third_party/rust/syn/src/custom_keyword.rs | 12 +-
+ .../rust/syn/src/custom_punctuation.rs | 50 +-
+ third_party/rust/syn/src/data.rs | 96 +-
+ third_party/rust/syn/src/derive.rs | 10 +-
+ third_party/rust/syn/src/discouraged.rs | 27 +-
+ third_party/rust/syn/src/error.rs | 33 +-
+ third_party/rust/syn/src/expr.rs | 826 +++--
+ third_party/rust/syn/src/ext.rs | 12 +-
+ third_party/rust/syn/src/file.rs | 4 +-
+ third_party/rust/syn/src/gen/clone.rs | 2051 ++++++++++++
+ third_party/rust/syn/src/gen/debug.rs | 2857 +++++++++++++++++
+ third_party/rust/syn/src/gen/eq.rs | 1930 +++++++++++
+ third_party/rust/syn/src/gen/fold.rs | 287 +-
+ third_party/rust/syn/src/gen/hash.rs | 2691 ++++++++++++++++
+ third_party/rust/syn/src/gen/visit.rs | 19 +-
+ third_party/rust/syn/src/gen/visit_mut.rs | 19 +-
+ third_party/rust/syn/src/generics.rs | 255 +-
+ third_party/rust/syn/src/item.rs | 1515 +++++----
+ third_party/rust/syn/src/keyword.rs | 0
+ third_party/rust/syn/src/lib.rs | 109 +-
+ third_party/rust/syn/src/lifetime.rs | 13 +-
+ third_party/rust/syn/src/lit.rs | 581 ++--
+ third_party/rust/syn/src/mac.rs | 55 +-
+ third_party/rust/syn/src/macros.rs | 61 +-
+ third_party/rust/syn/src/op.rs | 6 +-
+ third_party/rust/syn/src/parse.rs | 211 +-
+ third_party/rust/syn/src/parse_macro_input.rs | 32 +-
+ third_party/rust/syn/src/parse_quote.rs | 15 +-
+ third_party/rust/syn/src/pat.rs | 313 +-
+ third_party/rust/syn/src/path.rs | 33 +-
+ third_party/rust/syn/src/punctuated.rs | 123 +-
+ third_party/rust/syn/src/reserved.rs | 42 +
+ third_party/rust/syn/src/spanned.rs | 4 +-
+ third_party/rust/syn/src/stmt.rs | 141 +-
+ third_party/rust/syn/src/token.rs | 99 +-
+ third_party/rust/syn/src/tt.rs | 6 +-
+ third_party/rust/syn/src/ty.rs | 364 ++-
+ third_party/rust/syn/src/verbatim.rs | 15 +
+ third_party/rust/syn/src/whitespace.rs | 65 +
+ third_party/rust/syn/tests/.gitignore | 1 +
+ third_party/rust/syn/tests/clone.sh | 16 -
+ third_party/rust/syn/tests/common/eq.rs | 247 +-
+ third_party/rust/syn/tests/common/mod.rs | 13 +
+ third_party/rust/syn/tests/common/parse.rs | 24 +-
+ third_party/rust/syn/tests/debug/gen.rs | 50 +-
+ third_party/rust/syn/tests/debug/mod.rs | 17 +-
+ third_party/rust/syn/tests/features/error.rs | 1 -
+ third_party/rust/syn/tests/features/mod.rs | 22 -
+ third_party/rust/syn/tests/macros/mod.rs | 8 +-
+ third_party/rust/syn/tests/repo/mod.rs | 137 +-
+ third_party/rust/syn/tests/repo/progress.rs | 37 +
+ third_party/rust/syn/tests/test_asyncness.rs | 38 +-
+ third_party/rust/syn/tests/test_attribute.rs | 452 +--
+ .../rust/syn/tests/test_derive_input.rs | 1321 ++++----
+ third_party/rust/syn/tests/test_expr.rs | 314 +-
+ third_party/rust/syn/tests/test_generics.rs | 371 ++-
+ third_party/rust/syn/tests/test_grouping.rs | 53 +-
+ third_party/rust/syn/tests/test_ident.rs | 5 -
+ third_party/rust/syn/tests/test_item.rs | 45 +
+ third_party/rust/syn/tests/test_iterators.rs | 7 +-
+ third_party/rust/syn/tests/test_lit.rs | 75 +-
+ third_party/rust/syn/tests/test_meta.rs | 498 ++-
+ .../rust/syn/tests/test_parse_buffer.rs | 41 +-
+ .../rust/syn/tests/test_parse_stream.rs | 12 +
+ third_party/rust/syn/tests/test_pat.rs | 27 +-
+ third_party/rust/syn/tests/test_path.rs | 52 +
+ third_party/rust/syn/tests/test_precedence.rs | 196 +-
+ third_party/rust/syn/tests/test_receiver.rs | 127 +
+ third_party/rust/syn/tests/test_round_trip.rs | 41 +-
+ third_party/rust/syn/tests/test_shebang.rs | 59 +
+ .../rust/syn/tests/test_should_parse.rs | 4 -
+ third_party/rust/syn/tests/test_size.rs | 2 -
+ third_party/rust/syn/tests/test_stmt.rs | 44 +
+ .../rust/syn/tests/test_token_trees.rs | 12 +-
+ third_party/rust/syn/tests/test_ty.rs | 53 +
+ third_party/rust/syn/tests/test_visibility.rs | 145 +
+ third_party/rust/syn/tests/zzz_stable.rs | 4 +-
+ 99 files changed, 17098 insertions(+), 5787 deletions(-)
+ create mode 100644 third_party/rust/proc-macro2/src/detection.rs
+ create mode 100644 third_party/rust/proc-macro2/src/parse.rs
+ delete mode 100644 third_party/rust/proc-macro2/src/strnom.rs
+ create mode 100644 third_party/rust/proc-macro2/tests/comments.rs
+ create mode 100644 third_party/rust/proc-macro2/tests/test_fmt.rs
+ create mode 100644 third_party/rust/syn/src/gen/clone.rs
+ create mode 100644 third_party/rust/syn/src/gen/debug.rs
+ create mode 100644 third_party/rust/syn/src/gen/eq.rs
+ create mode 100644 third_party/rust/syn/src/gen/hash.rs
+ delete mode 100644 third_party/rust/syn/src/keyword.rs
+ create mode 100644 third_party/rust/syn/src/reserved.rs
+ create mode 100644 third_party/rust/syn/src/verbatim.rs
+ create mode 100644 third_party/rust/syn/src/whitespace.rs
+ create mode 100644 third_party/rust/syn/tests/.gitignore
+ delete mode 100755 third_party/rust/syn/tests/clone.sh
+ delete mode 100644 third_party/rust/syn/tests/features/error.rs
+ delete mode 100644 third_party/rust/syn/tests/features/mod.rs
+ create mode 100644 third_party/rust/syn/tests/repo/progress.rs
+ create mode 100644 third_party/rust/syn/tests/test_item.rs
+ create mode 100644 third_party/rust/syn/tests/test_parse_stream.rs
+ create mode 100644 third_party/rust/syn/tests/test_path.rs
+ create mode 100644 third_party/rust/syn/tests/test_receiver.rs
+ create mode 100644 third_party/rust/syn/tests/test_shebang.rs
+ create mode 100644 third_party/rust/syn/tests/test_stmt.rs
+ create mode 100644 third_party/rust/syn/tests/test_ty.rs
+ create mode 100644 third_party/rust/syn/tests/test_visibility.rs
+
+diff --git a/Cargo.lock b/Cargo.lock
+index b1fca7c..bb0e3ce 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -3717,9 +3717,9 @@ dependencies = [
+
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.5"
++version = "1.0.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"
++checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
+ dependencies = [
+ "unicode-xid",
+ ]
+@@ -4647,9 +4647,9 @@ dependencies = [
+
+ [[package]]
+ name = "syn"
+-version = "1.0.5"
++version = "1.0.40"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
++checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
+ dependencies = [
+ "proc-macro2",
+ "quote",
+diff --git a/third_party/rust/proc-macro2/.cargo-checksum.json b/third_party/rust/proc-macro2/.cargo-checksum.json
+index eeef412..43f5316 100644
+--- a/third_party/rust/proc-macro2/.cargo-checksum.json
++++ b/third_party/rust/proc-macro2/.cargo-checksum.json
+@@ -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
+index 95d6536..19cb57d 100644
+--- a/third_party/rust/proc-macro2/Cargo.toml
++++ b/third_party/rust/proc-macro2/Cargo.toml
+@@ -13,21 +13,22 @@
+ [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]
+@@ -39,5 +40,3 @@ 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
+index 19b0c3b..3d05e87 100644
+--- a/third_party/rust/proc-macro2/README.md
++++ b/third_party/rust/proc-macro2/README.md
+@@ -1,6 +1,6 @@
+ # proc-macro2
+
+-[](https://travis-ci.com/alexcrichton/proc-macro2)
++[](https://github.com/alexcrichton/proc-macro2/actions)
+ [](https://crates.io/crates/proc-macro2)
+ [](https://docs.rs/proc-macro2)
+
+diff --git a/third_party/rust/proc-macro2/build.rs b/third_party/rust/proc-macro2/build.rs
+index deb9b92..153e13f 100644
+--- a/third_party/rust/proc-macro2/build.rs
++++ b/third_party/rust/proc-macro2/build.rs
+@@ -14,6 +14,10 @@
+ // 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
+@@ -57,6 +61,14 @@ fn main() {
+ 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;
+diff --git a/third_party/rust/proc-macro2/src/detection.rs b/third_party/rust/proc-macro2/src/detection.rs
+new file mode 100644
+index 0000000..c597bc9
+--- /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
+index fe582b3..949b9a5 100644
+--- a/third_party/rust/proc-macro2/src/fallback.rs
++++ b/third_party/rust/proc-macro2/src/fallback.rs
+@@ -1,27 +1,41 @@
++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 {
+@@ -31,6 +45,72 @@ impl TokenStream {
+ 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)]
+@@ -59,20 +139,16 @@ impl FromStr for TokenStream {
+ // 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() {
+@@ -80,37 +156,22 @@ impl fmt::Display for TokenStream {
+ 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)?
+- }
+- }
+- 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,
+- }
++ 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::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()
+@@ -139,28 +200,26 @@ impl From<TokenStream> for proc_macro::TokenStream {
+
+ 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 }
+@@ -168,31 +227,30 @@ impl iter::FromIterator<TokenStream> for TokenStream {
+ }
+
+ 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,
+ }
+
+@@ -208,7 +266,7 @@ impl SourceFile {
+ }
+ }
+
+-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())
+@@ -218,7 +276,7 @@ impl fmt::Debug for SourceFile {
+ }
+
+ #[derive(Clone, Copy, Debug, PartialEq, Eq)]
+-pub struct LineColumn {
++pub(crate) struct LineColumn {
+ pub line: usize,
+ pub column: usize,
+ }
+@@ -228,23 +286,11 @@ 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],
+ }],
+ });
+ }
+@@ -282,16 +328,21 @@ impl FileInfo {
+ }
+ }
+
+-/// 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)]
+@@ -310,23 +361,22 @@ impl SourceMap {
+ }
+
+ 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
+@@ -343,11 +393,11 @@ impl SourceMap {
+ }
+
+ #[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 {
+@@ -361,12 +411,16 @@ impl 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
+@@ -374,7 +428,6 @@ impl Span {
+ *self
+ }
+
+- #[cfg(procmacro2_semver_exempt)]
+ pub fn located_at(&self, other: Span) -> Span {
+ other
+ }
+@@ -427,26 +480,59 @@ impl Span {
+ })
+ })
+ }
++
++ #[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,
+@@ -474,11 +560,11 @@ impl Group {
+ }
+
+ 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) {
+@@ -486,36 +572,45 @@ impl Group {
+ }
+ }
+
+-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,
+@@ -549,16 +644,14 @@ impl Ident {
+ }
+ }
+
+-#[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 == '_'
+@@ -615,18 +708,18 @@ where
+ }
+ }
+
+-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));
+@@ -637,17 +730,17 @@ impl fmt::Debug for 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,
+ }
+@@ -669,7 +762,7 @@ macro_rules! unsuffixed_numbers {
+ }
+
+ impl Literal {
+- fn _new(text: String) -> Literal {
++ pub(crate) fn _new(text: String) -> Literal {
+ Literal {
+ text,
+ span: Span::call_site(),
+@@ -711,7 +804,7 @@ impl Literal {
+
+ 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)
+@@ -719,7 +812,7 @@ impl Literal {
+
+ 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)
+@@ -730,10 +823,10 @@ impl Literal {
+ 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('"');
+@@ -744,10 +837,10 @@ impl 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)
+@@ -756,6 +849,7 @@ impl Literal {
+ 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"),
+@@ -784,651 +878,17 @@ impl Literal {
+ }
+ }
+
+-impl fmt::Display for Literal {
++impl Display for Literal {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+- self.text.fmt(f)
++ Display::fmt(&self.text, f)
+ }
+ }
+
+-impl fmt::Debug for Literal {
++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));
+- #[cfg(procmacro2_semver_exempt)]
+- debug.field("span", &self.span);
++ debug_span_field_if_nontrivial(&mut debug, 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),
+- }
+-}
+-
+-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)
+- }
+-}
+-
+-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
+index a08be3e..bd20638 100644
+--- a/third_party/rust/proc-macro2/src/lib.rs
++++ b/third_party/rust/proc-macro2/src/lib.rs
+@@ -78,15 +78,16 @@
+ //! 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;
+@@ -96,9 +97,15 @@ 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;
+@@ -228,22 +235,22 @@ impl FromIterator<TokenStream> for TokenStream {
+ /// 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)
+ }
+ }
+
+@@ -291,9 +298,9 @@ impl SourceFile {
+ }
+
+ #[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)
+ }
+ }
+
+@@ -311,6 +318,22 @@ pub struct LineColumn {
+ 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 {
+@@ -342,6 +365,16 @@ impl 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.
+@@ -352,18 +385,12 @@ impl Span {
+
+ /// 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))
+ }
+@@ -439,9 +466,9 @@ impl Span {
+ }
+
+ /// 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)
+ }
+ }
+
+@@ -462,11 +489,11 @@ 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(),
+ }
+ }
+
+@@ -476,11 +503,11 @@ impl TokenTree {
+ /// 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),
+ }
+ }
+ }
+@@ -513,32 +540,32 @@ impl From<Literal> for TokenTree {
+ /// 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),
+ }
+ }
+ }
+@@ -651,15 +678,15 @@ impl Group {
+ /// 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)
+ }
+ }
+
+@@ -730,13 +757,13 @@ impl Punct {
+
+ /// 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);
+@@ -920,15 +947,15 @@ impl Hash for Ident {
+
+ /// 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)
+ }
+ }
+
+@@ -1140,26 +1167,26 @@ impl Literal {
+ }
+ }
+
+-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.
+ ///
+@@ -1179,9 +1206,9 @@ pub mod token_stream {
+ }
+ }
+
+- 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)
+ }
+ }
+
+diff --git a/third_party/rust/proc-macro2/src/parse.rs b/third_party/rust/proc-macro2/src/parse.rs
+new file mode 100644
+index 0000000..f4f8a47
+--- /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
+index eb7d0b8..0000000
+--- 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
+index 552b938..dca6b3d 100644
+--- a/third_party/rust/proc-macro2/src/wrapper.rs
++++ b/third_party/rust/proc-macro2/src/wrapper.rs
+@@ -1,15 +1,15 @@
+-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),
+ }
+@@ -19,73 +19,16 @@ pub enum TokenStream {
+ // 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")
+ }
+@@ -103,7 +46,12 @@ impl DeferredTokenStream {
+ }
+
+ 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 {
+@@ -114,7 +62,7 @@ impl DeferredTokenStream {
+
+ 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())
+@@ -147,9 +95,9 @@ 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()?))
+@@ -157,11 +105,17 @@ impl FromStr for TokenStream {
+ }
+ }
+
+-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),
+ }
+ }
+ }
+@@ -187,7 +141,7 @@ impl From<fallback::TokenStream> for TokenStream {
+ }
+ }
+
+-// 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(),
+@@ -207,7 +161,7 @@ fn into_compiler_token(token: TokenTree) -> proc_macro::TokenTree {
+
+ 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())
+@@ -215,9 +169,9 @@ impl From<TokenTree> for TokenStream {
+ }
+ }
+
+-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(),
+ ))
+@@ -227,7 +181,7 @@ impl iter::FromIterator<TokenTree> for TokenStream {
+ }
+ }
+
+-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() {
+@@ -252,14 +206,15 @@ impl iter::FromIterator<TokenStream> for TokenStream {
+ }
+
+ 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),
+ }
+ }
+ }
+@@ -270,20 +225,20 @@ impl Extend<TokenStream> for TokenStream {
+ 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),
+ }
+ }
+ }
+@@ -300,17 +255,17 @@ impl From<fallback::LexError> for LexError {
+ }
+ }
+
+-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),
+ }
+@@ -361,7 +316,7 @@ impl Iterator for TokenTreeIter {
+ }
+ }
+
+-impl fmt::Debug for TokenTreeIter {
++impl Debug for TokenTreeIter {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ f.debug_struct("TokenTreeIter").finish()
+ }
+@@ -369,7 +324,7 @@ impl fmt::Debug for TokenTreeIter {
+
+ #[derive(Clone, PartialEq, Eq)]
+ #[cfg(super_unstable)]
+-pub enum SourceFile {
++pub(crate) enum SourceFile {
+ Compiler(proc_macro::SourceFile),
+ Fallback(fallback::SourceFile),
+ }
+@@ -397,58 +352,77 @@ impl SourceFile {
+ }
+
+ #[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(),
+ }
+@@ -542,16 +516,16 @@ impl From<fallback::Span> for Span {
+ }
+ }
+
+-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);
+@@ -561,7 +535,7 @@ pub fn debug_span_field_if_nontrivial(debug: &mut fmt::DebugStruct, span: Span)
+ }
+
+ #[derive(Clone)]
+-pub enum Group {
++pub(crate) enum Group {
+ Compiler(proc_macro::Group),
+ Fallback(fallback::Group),
+ }
+@@ -652,26 +626,26 @@ impl From<fallback::Group> for Group {
+ }
+ }
+
+-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),
+ }
+@@ -747,26 +721,26 @@ where
+ }
+ }
+
+-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),
+ }
+@@ -774,7 +748,7 @@ pub enum 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))
+@@ -786,7 +760,7 @@ macro_rules! suffixed_numbers {
+ 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))
+@@ -830,7 +804,7 @@ impl Literal {
+ }
+
+ 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))
+@@ -838,7 +812,7 @@ impl Literal {
+ }
+
+ 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))
+@@ -846,7 +820,7 @@ impl Literal {
+ }
+
+ 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))
+@@ -854,7 +828,7 @@ impl Literal {
+ }
+
+ 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))
+@@ -862,7 +836,7 @@ impl Literal {
+ }
+
+ 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))
+@@ -908,20 +882,20 @@ impl From<fallback::Literal> for Literal {
+ }
+ }
+
+-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
+index 0000000..708cccb
+--- /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
+index 7528388..8bd6bf9 100644
+--- a/third_party/rust/proc-macro2/tests/test.rs
++++ b/third_party/rust/proc-macro2/tests/test.rs
+@@ -1,6 +1,5 @@
+-use std::str::{self, FromStr};
+-
+ use proc_macro2::{Ident, Literal, Spacing, Span, TokenStream, TokenTree};
++use std::str::{self, FromStr};
+
+ #[test]
+ fn idents() {
+@@ -110,6 +109,33 @@ fn literal_suffix() {
+ 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]
+@@ -166,36 +192,6 @@ fn fail() {
+ #[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
+@@ -274,49 +270,7 @@ fn span_join() {
+ #[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]
+@@ -345,11 +299,11 @@ fn raw_identifier() {
+ 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));
+ }
+@@ -358,7 +312,7 @@ fn test_debug_ident() {
+ 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 {
+@@ -379,7 +333,7 @@ TokenStream [
+ ]\
+ ";
+
+- #[cfg(not(procmacro2_semver_exempt))]
++ #[cfg(not(span_locations))]
+ let expected_before_trailing_commas = "\
+ TokenStream [
+ Group {
+@@ -400,7 +354,7 @@ TokenStream [
+ ]\
+ ";
+
+- #[cfg(procmacro2_semver_exempt)]
++ #[cfg(span_locations)]
+ let expected = "\
+ TokenStream [
+ Group {
+@@ -425,7 +379,7 @@ TokenStream [
+ ]\
+ ";
+
+- #[cfg(procmacro2_semver_exempt)]
++ #[cfg(span_locations)]
+ let expected_before_trailing_commas = "\
+ TokenStream [
+ Group {
+@@ -464,3 +418,80 @@ fn default_tokenstream_is_empty() {
+
+ 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
+index 0000000..99a0aee
+--- /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
+index 77939d8..b325093 100644
+--- a/third_party/rust/syn/.cargo-checksum.json
++++ b/third_party/rust/syn/.cargo-checksum.json
+@@ -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
+index 7a5c962..20277fc 100644
+--- a/third_party/rust/syn/Cargo.toml
++++ b/third_party/rust/syn/Cargo.toml
+@@ -13,7 +13,7 @@
+ [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"
+@@ -24,25 +24,21 @@ 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]
+@@ -52,18 +48,34 @@ 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"
+
+@@ -80,7 +92,6 @@ 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
+index 29a7f32..12b5f45 100644
+--- a/third_party/rust/syn/README.md
++++ b/third_party/rust/syn/README.md
+@@ -1,10 +1,10 @@
+ Parser for Rust source code
+ ===========================
+
+-[](https://travis-ci.org/dtolnay/syn)
+-[](https://crates.io/crates/syn)
+-[](https://docs.rs/syn/1.0/syn/)
+-[](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.
+@@ -46,10 +46,6 @@ contains some APIs that may be useful more generally.
+ [`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)
+@@ -88,8 +84,6 @@ proc-macro = true
+ ```
+
+ ```rust
+-extern crate proc_macro;
+-
+ use proc_macro::TokenStream;
+ use quote::quote;
+ use syn::{parse_macro_input, DeriveInput};
+@@ -271,7 +265,7 @@ 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>
+
+diff --git a/third_party/rust/syn/benches/file.rs b/third_party/rust/syn/benches/file.rs
+index 08ecd90..58ab8df 100644
+--- a/third_party/rust/syn/benches/file.rs
++++ b/third_party/rust/syn/benches/file.rs
+@@ -1,9 +1,16 @@
+ // $ 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;
+
+diff --git a/third_party/rust/syn/benches/rust.rs b/third_party/rust/syn/benches/rust.rs
+index e3d9cd2..50e1a7f 100644
+--- a/third_party/rust/syn/benches/rust.rs
++++ b/third_party/rust/syn/benches/rust.rs
+@@ -4,7 +4,14 @@
+ // $ 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;
+
+@@ -28,31 +35,35 @@ mod syn_parse {
+ }
+
+ #[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,
+@@ -104,11 +115,11 @@ 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<(), ()>),
+ )*
+ ]
+ };
+@@ -128,12 +139,12 @@ fn main() {
+
+ 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);
+diff --git a/third_party/rust/syn/build.rs b/third_party/rust/syn/build.rs
+index c0f9ed3..cf7681c 100644
+--- a/third_party/rust/syn/build.rs
++++ b/third_party/rust/syn/build.rs
+@@ -1,6 +1,6 @@
+ 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
+@@ -26,38 +26,14 @@ struct Compiler {
+ }
+
+ 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
+index 34009de..fa4f1cb 100644
+--- a/third_party/rust/syn/src/attr.rs
++++ b/third_party/rust/syn/src/attr.rs
+@@ -9,15 +9,11 @@ use proc_macro2::TokenStream;
+ 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>
+@@ -111,7 +107,46 @@ ast_struct! {
+ ///
+ /// [`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,
+@@ -120,39 +155,11 @@ ast_struct! {
+ }
+ }
+
+-#[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> {
+@@ -199,7 +206,7 @@ impl Attribute {
+ /// ^^^^^^^^^ 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> {
+@@ -208,7 +215,7 @@ impl Attribute {
+
+ /// 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> {
+@@ -221,7 +228,7 @@ impl Attribute {
+
+ /// 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>> {
+@@ -234,7 +241,7 @@ impl Attribute {
+
+ /// 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>> {
+@@ -247,7 +254,7 @@ impl Attribute {
+ }
+
+ #[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(_) => "#!",
+@@ -261,19 +268,23 @@ fn error_expected_args(attr: &Attribute) -> Error {
+ 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;
+@@ -298,7 +309,7 @@ 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
+@@ -312,7 +323,6 @@ ast_enum! {
+ /// - `#![feature(proc_macro)]`
+ /// - `//! # Example`
+ /// - `/*! Please file an issue */`
+- #[cfg_attr(feature = "clone-impls", derive(Copy))]
+ pub enum AttrStyle {
+ Outer,
+ Inner(Token![!]),
+@@ -322,7 +332,7 @@ ast_enum! {
+ 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
+@@ -360,7 +370,7 @@ ast_enum_of_structs! {
+ 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,
+@@ -372,7 +382,7 @@ ast_struct! {
+ 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,
+@@ -398,7 +408,7 @@ impl Meta {
+ 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
+@@ -429,8 +439,8 @@ ast_enum_of_structs! {
+ /// as type `AttributeArgs`.
+ ///
+ /// ```
+-/// extern crate proc_macro;
+-///
++/// # extern crate proc_macro;
++/// #
+ /// use proc_macro::TokenStream;
+ /// use syn::{parse_macro_input, AttributeArgs, ItemFn};
+ ///
+@@ -464,7 +474,7 @@ where
+ fn is_outer(attr: &&Attribute) -> bool {
+ match attr.style {
+ AttrStyle::Outer => true,
+- _ => false,
++ AttrStyle::Inner(_) => false,
+ }
+ }
+ self.into_iter().filter(is_outer)
+@@ -474,7 +484,7 @@ where
+ fn is_inner(attr: &&Attribute) -> bool {
+ match attr.style {
+ AttrStyle::Inner(_) => true,
+- _ => false,
++ AttrStyle::Outer => false,
+ }
+ }
+ self.into_iter().filter(is_inner)
+diff --git a/third_party/rust/syn/src/buffer.rs b/third_party/rust/syn/src/buffer.rs
+index 551a5ac..a461cc4 100644
+--- a/third_party/rust/syn/src/buffer.rs
++++ b/third_party/rust/syn/src/buffer.rs
+@@ -1,7 +1,7 @@
+ //! 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
+@@ -36,7 +36,7 @@ enum Entry {
+ /// `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
+@@ -98,7 +98,7 @@ impl TokenBuffer {
+ /// 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"))),
+@@ -133,8 +133,7 @@ impl TokenBuffer {
+ /// 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,
+@@ -201,13 +200,13 @@ impl<'a> 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
+@@ -215,13 +214,14 @@ impl<'a> Cursor<'a> {
+ 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
+@@ -342,6 +342,44 @@ impl<'a> Cursor<'a> {
+ 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 {
+diff --git a/third_party/rust/syn/src/custom_keyword.rs b/third_party/rust/syn/src/custom_keyword.rs
+index 200e847..a33044a 100644
+--- a/third_party/rust/syn/src/custom_keyword.rs
++++ b/third_party/rust/syn/src/custom_keyword.rs
+@@ -86,7 +86,7 @@
+ /// }
+ /// }
+ /// ```
+-#[macro_export(local_inner_macros)]
++#[macro_export]
+ macro_rules! custom_keyword {
+ ($ident:ident) => {
+ #[allow(non_camel_case_types)]
+@@ -95,7 +95,7 @@ macro_rules! custom_keyword {
+ }
+
+ #[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 {
+@@ -112,10 +112,10 @@ macro_rules! custom_keyword {
+ }
+ }
+
+- 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);
+ };
+ }
+
+diff --git a/third_party/rust/syn/src/custom_punctuation.rs b/third_party/rust/syn/src/custom_punctuation.rs
+index 29fa448..70dff42 100644
+--- a/third_party/rust/syn/src/custom_punctuation.rs
++++ b/third_party/rust/syn/src/custom_punctuation.rs
+@@ -74,19 +74,19 @@
+ /// 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)
+ }
+@@ -98,33 +98,33 @@ macro_rules! custom_punctuation {
+ }
+ }
+
+- 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))
+ }
+ }
+@@ -142,12 +142,12 @@ macro_rules! impl_parse_for_custom_punctuation {
+ // 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)
+ }
+ }
+ };
+@@ -221,16 +221,16 @@ macro_rules! impl_extra_traits_for_custom_punctuation {
+
+ // 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 };
+@@ -279,7 +279,7 @@ macro_rules! custom_punctuation_len {
+ ($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.
+@@ -297,13 +297,3 @@ macro_rules! stringify_punct {
+ 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
+index be43679..b217b8c 100644
+--- a/third_party/rust/syn/src/data.rs
++++ b/third_party/rust/syn/src/data.rs
+@@ -4,7 +4,7 @@ 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.
+@@ -24,7 +24,7 @@ ast_struct! {
+ 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
+@@ -52,7 +52,7 @@ 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,
+@@ -63,7 +63,7 @@ ast_struct! {
+ 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,
+@@ -93,6 +93,24 @@ impl Fields {
+ 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 {
+@@ -129,7 +147,7 @@ impl<'a> IntoIterator for &'a mut Fields {
+ 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.
+@@ -154,7 +172,7 @@ 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
+@@ -184,7 +202,7 @@ ast_enum_of_structs! {
+ 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],
+@@ -194,7 +212,7 @@ ast_struct! {
+ 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],
+@@ -205,7 +223,7 @@ 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],
+@@ -220,12 +238,15 @@ 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) {
+@@ -295,6 +316,17 @@ pub mod parsing {
+
+ 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]) {
+@@ -310,27 +342,39 @@ pub mod parsing {
+ 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])
+ {
+- 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)?)),
+- }));
++ 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: Some(content.parse()?),
+- path: Box::new(content.call(Path::parse_mod_style)?),
++ paren_token,
++ in_token: Some(in_token),
++ path: Box::new(path),
+ }));
+ }
+ }
+@@ -347,6 +391,14 @@ pub mod parsing {
+ }))
+ }
+ }
++
++ #[cfg(feature = "full")]
++ pub(crate) fn is_some(&self) -> bool {
++ match self {
++ Visibility::Inherited => false,
++ _ => true,
++ }
++ }
+ }
+ }
+
+diff --git a/third_party/rust/syn/src/derive.rs b/third_party/rust/syn/src/derive.rs
+index 8cb9cf7..3fa9d89 100644
+--- a/third_party/rust/syn/src/derive.rs
++++ b/third_party/rust/syn/src/derive.rs
+@@ -4,7 +4,7 @@ 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>,
+@@ -26,7 +26,7 @@ ast_struct! {
+ 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
+ ///
+@@ -53,7 +53,7 @@ ast_enum_of_structs! {
+ 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],
+@@ -65,7 +65,7 @@ ast_struct! {
+ 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],
+@@ -77,7 +77,7 @@ ast_struct! {
+ 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],
+diff --git a/third_party/rust/syn/src/discouraged.rs b/third_party/rust/syn/src/discouraged.rs
+index 4d9ff93..76c9fce 100644
+--- a/third_party/rust/syn/src/discouraged.rs
++++ b/third_party/rust/syn/src/discouraged.rs
+@@ -16,7 +16,7 @@ pub trait Speculative {
+ /// 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
+@@ -72,7 +72,6 @@ pub trait Speculative {
+ /// || 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));
+@@ -164,6 +163,30 @@ impl<'a> Speculative for ParseBuffer<'a> {
+ 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
+index 146d652..dba34f9 100644
+--- a/third_party/rust/syn/src/error.rs
++++ b/third_party/rust/syn/src/error.rs
+@@ -1,4 +1,3 @@
+-use std;
+ use std::fmt::{self, Debug, Display};
+ use std::iter::FromIterator;
+ use std::slice;
+@@ -32,8 +31,8 @@ pub type Result<T> = std::result::Result<T, Error>;
+ /// conversion to `compile_error!` automatically.
+ ///
+ /// ```
+-/// extern crate proc_macro;
+-///
++/// # extern crate proc_macro;
++/// #
+ /// use proc_macro::TokenStream;
+ /// use syn::{parse_macro_input, AttributeArgs, ItemFn};
+ ///
+@@ -82,7 +81,6 @@ pub type Result<T> = std::result::Result<T, Error>;
+ /// # }
+ /// # }
+ /// ```
+-#[derive(Clone)]
+ pub struct Error {
+ messages: Vec<ErrorMessage>,
+ }
+@@ -250,6 +248,17 @@ pub fn new_at<T: Display>(scope: Span, cursor: Cursor, message: T) -> Error {
+ }
+ }
+
++#[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 {
+@@ -278,6 +287,14 @@ impl Display for Error {
+ }
+ }
+
++impl Clone for Error {
++ fn clone(&self) -> Self {
++ Error {
++ messages: self.messages.clone(),
++ }
++ }
++}
++
+ impl Clone for ErrorMessage {
+ fn clone(&self) -> Self {
+ let start = self
+@@ -355,3 +372,11 @@ impl<'a> Iterator for Iter<'a> {
+ })
+ }
+ }
++
++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
+index 2874a46..2fe0e0b 100644
+--- a/third_party/rust/syn/src/expr.rs
++++ b/third_party/rust/syn/src/expr.rs
+@@ -1,18 +1,21 @@
+ 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
+ ///
+@@ -83,7 +86,7 @@ ast_enum_of_structs! {
+ /// 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),
+
+@@ -228,7 +231,7 @@ ast_enum_of_structs! {
+ 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,
+@@ -239,7 +242,7 @@ ast_struct! {
+ 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>,
+@@ -251,7 +254,7 @@ ast_struct! {
+ 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>,
+@@ -263,7 +266,7 @@ ast_struct! {
+ 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],
+@@ -275,7 +278,7 @@ ast_struct! {
+ 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>,
+@@ -287,7 +290,7 @@ ast_struct! {
+ 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>,
+@@ -300,7 +303,7 @@ ast_struct! {
+ 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>,
+@@ -311,7 +314,7 @@ ast_struct! {
+ 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],
+@@ -323,7 +326,7 @@ 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],
+@@ -335,7 +338,7 @@ ast_struct! {
+ 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>,
+@@ -348,7 +351,7 @@ ast_struct! {
+ 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>,
+@@ -361,7 +364,7 @@ ast_struct! {
+ 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]>,
+@@ -378,7 +381,7 @@ ast_struct! {
+ 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],
+@@ -390,7 +393,7 @@ 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>,
+@@ -402,7 +405,7 @@ ast_struct! {
+ 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>,
+@@ -421,7 +424,7 @@ ast_struct! {
+ /// 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,
+@@ -436,7 +439,7 @@ ast_struct! {
+ /// 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],
+@@ -449,7 +452,7 @@ ast_struct! {
+ 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>,
+@@ -462,7 +465,7 @@ ast_struct! {
+ 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],
+@@ -475,7 +478,7 @@ ast_struct! {
+ 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>,
+@@ -486,7 +489,7 @@ ast_struct! {
+ 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>,
+@@ -498,7 +501,7 @@ ast_struct! {
+ 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,
+@@ -508,7 +511,7 @@ ast_struct! {
+ 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],
+@@ -521,7 +524,7 @@ ast_struct! {
+ 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>,
+@@ -536,7 +539,7 @@ ast_struct! {
+ 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,
+@@ -550,7 +553,7 @@ ast_struct! {
+ ///
+ /// 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>,
+@@ -562,7 +565,7 @@ ast_struct! {
+ 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>>,
+@@ -574,7 +577,7 @@ ast_struct! {
+ 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![&],
+@@ -587,7 +590,7 @@ ast_struct! {
+ 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,
+@@ -600,7 +603,7 @@ ast_struct! {
+ 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],
+@@ -614,7 +617,7 @@ ast_struct! {
+ /// 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,
+@@ -628,7 +631,7 @@ ast_struct! {
+ 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>,
+@@ -639,7 +642,7 @@ ast_struct! {
+ 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],
+@@ -650,7 +653,7 @@ ast_struct! {
+ 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,
+@@ -661,7 +664,7 @@ ast_struct! {
+ 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>,
+@@ -673,7 +676,7 @@ ast_struct! {
+ 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>,
+@@ -685,7 +688,7 @@ ast_struct! {
+ 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],
+@@ -696,7 +699,7 @@ ast_struct! {
+ 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>,
+@@ -709,7 +712,7 @@ ast_struct! {
+ 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],
+@@ -717,232 +720,6 @@ ast_struct! {
+ }
+ }
+
+-#[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> {
+@@ -996,7 +773,7 @@ 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`.
+@@ -1006,12 +783,50 @@ ast_enum! {
+ }
+ }
+
++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,
+ }
+@@ -1027,28 +842,28 @@ impl From<usize> for Index {
+ }
+ }
+
+-#[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)
+ }
+ }
+
+@@ -1057,7 +872,7 @@ 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![<],
+@@ -1070,7 +885,7 @@ ast_struct! {
+ 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),
+@@ -1086,7 +901,7 @@ ast_enum! {
+ 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>,
+@@ -1107,7 +922,7 @@ ast_struct! {
+ 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![:],
+@@ -1134,7 +949,7 @@ ast_struct! {
+ /// # }
+ /// ```
+ ///
+- /// *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,
+@@ -1149,8 +964,7 @@ ast_struct! {
+ 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![..]),
+@@ -1162,7 +976,7 @@ ast_enum! {
+ #[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(..)
+@@ -1183,16 +997,17 @@ pub(crate) mod parsing {
+
+ 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,
+@@ -1246,9 +1061,121 @@ pub(crate) mod parsing {
+ }
+ }
+
+- #[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")]
+@@ -1430,56 +1357,84 @@ pub(crate) mod parsing {
+ 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)?),
+ }))
+@@ -1495,13 +1450,11 @@ pub(crate) mod parsing {
+ // <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)?;
+
+@@ -1523,18 +1476,26 @@ pub(crate) mod parsing {
+ 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 {
+@@ -1620,10 +1581,17 @@ pub(crate) mod parsing {
+ });
+ } 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) {
+@@ -1646,7 +1614,11 @@ pub(crate) mod parsing {
+ // 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)
+@@ -1668,7 +1640,6 @@ pub(crate) mod parsing {
+ || 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)
+@@ -1740,7 +1711,6 @@ pub(crate) mod parsing {
+ || 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)
+@@ -1878,7 +1848,7 @@ pub(crate) mod parsing {
+
+ #[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]) {
+@@ -1905,7 +1875,7 @@ pub(crate) mod parsing {
+ 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()));
+@@ -1951,7 +1921,16 @@ pub(crate) mod parsing {
+
+ #[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)
+ }
+
+@@ -1960,44 +1939,20 @@ pub(crate) mod parsing {
+ 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]) {
+@@ -2033,29 +1988,14 @@ pub(crate) mod parsing {
+ #[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);
+@@ -2063,7 +2003,7 @@ pub(crate) mod parsing {
+ let stmts = content.call(Block::parse_within)?;
+
+ Ok(ExprForLoop {
+- attrs: inner_attrs,
++ attrs: private::attrs(outer_attrs, inner_attrs),
+ label,
+ for_token,
+ pat,
+@@ -2077,6 +2017,7 @@ pub(crate) mod parsing {
+ #[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()?;
+
+@@ -2086,7 +2027,7 @@ pub(crate) mod parsing {
+ 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 },
+@@ -2097,8 +2038,9 @@ pub(crate) mod parsing {
+ #[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);
+@@ -2110,7 +2052,7 @@ pub(crate) mod parsing {
+ }
+
+ Ok(ExprMatch {
+- attrs: inner_attrs,
++ attrs: private::attrs(outer_attrs, inner_attrs),
+ match_token,
+ expr: Box::new(expr),
+ brace_token,
+@@ -2305,9 +2247,10 @@ pub(crate) mod parsing {
+ #[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);
+@@ -2315,7 +2258,7 @@ pub(crate) mod parsing {
+ 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),
+@@ -2399,6 +2342,7 @@ 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()?;
+@@ -2416,7 +2360,7 @@ pub(crate) mod parsing {
+ };
+
+ Ok(FieldValue {
+- attrs: Vec::new(),
++ attrs,
+ member,
+ colon_token,
+ expr: value,
+@@ -2433,46 +2377,36 @@ pub(crate) mod parsing {
+ 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,
+ })
+ }
+
+@@ -2577,27 +2511,7 @@ pub(crate) mod parsing {
+ 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()?;
+@@ -2641,6 +2555,26 @@ pub(crate) mod parsing {
+ }
+ }
+
++ 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,
++ member: Member::Unnamed(index),
++ });
++ *dot_token = Token);
++ }
++ Ok(!trailing_dot)
++ }
++
+ #[cfg(feature = "full")]
+ impl Member {
+ fn is_named(&self) -> bool {
+diff --git a/third_party/rust/syn/src/ext.rs b/third_party/rust/syn/src/ext.rs
+index d09577a..4f9bc14 100644
+--- a/third_party/rust/syn/src/ext.rs
++++ b/third_party/rust/syn/src/ext.rs
+@@ -1,6 +1,6 @@
+ //! 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;
+
+@@ -16,7 +16,7 @@ use crate::token::CustomToken;
+ /// 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.
+ ///
+@@ -129,7 +129,13 @@ mod private {
+
+ 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
+index 88c02fe..c8fab63 100644
+--- a/third_party/rust/syn/src/file.rs
++++ b/third_party/rust/syn/src/file.rs
+@@ -3,7 +3,7 @@ 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
+ ///
+@@ -37,6 +37,8 @@ ast_struct! {
+ /// 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);
+ /// }
+ /// ```
+diff --git a/third_party/rust/syn/src/gen/clone.rs b/third_party/rust/syn/src/gen/clone.rs
+new file mode 100644
+index 0000000..bea3887
+--- /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
+index 0000000..72baab0
+--- /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
+index 0000000..15b2bcb
+--- /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
+index f51218b..d9dd32a 100644
+--- a/third_party/rust/syn/src/gen/fold.rs
++++ b/third_party/rust/syn/src/gen/fold.rs
+@@ -2,6 +2,7 @@
+ // 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"))]
+@@ -26,7 +27,7 @@ macro_rules! full {
+ ///
+ /// [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 {
+@@ -433,35 +434,27 @@ pub trait Fold {
+ 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)
+ }
+@@ -799,10 +792,10 @@ 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")]
+@@ -819,9 +812,9 @@ where
+ 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"))]
+@@ -842,7 +835,7 @@ 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),
+@@ -859,7 +852,7 @@ where
+ 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),
+@@ -871,59 +864,47 @@ 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::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::BitAnd(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)))
+ }
+ }
+ }
+@@ -934,7 +915,7 @@ where
+ {
+ 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),
+ }
+ }
+@@ -955,9 +936,9 @@ where
+ {
+ BoundLifetimes {
+ for_token: Token),
+- 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"))]
+@@ -969,9 +950,9 @@ where
+ attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+ const_token: Token),
+ 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)),
+ }
+ }
+@@ -982,7 +963,7 @@ where
+ {
+ 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)),
+ }
+ }
+@@ -1016,7 +997,7 @@ where
+ DataStruct {
+ struct_token: Token),
+ 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")]
+@@ -1112,7 +1093,7 @@ where
+ 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)),
+ }
+ }
+@@ -1148,7 +1129,7 @@ where
+ 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)),
+ }
+ }
+@@ -1232,9 +1213,9 @@ where
+ asyncness: (node.asyncness).map(|it| Token)),
+ movability: (node.movability).map(|it| Token)),
+ capture: (node.capture).map(|it| Token)),
+- 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)),
+ }
+@@ -1258,7 +1239,7 @@ where
+ 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),
+ }
+ }
+@@ -1327,7 +1308,7 @@ where
+ attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+ let_token: Token),
+ 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)),
+ }
+ }
+@@ -1384,7 +1365,7 @@ where
+ 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)),
+@@ -1432,7 +1413,7 @@ where
+ {
+ 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)),
+ expr: Box::new(f.fold_expr(*node.expr)),
+@@ -1447,7 +1428,7 @@ where
+ 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)),
+ }
+ }
+@@ -1484,7 +1465,7 @@ where
+ 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")]
+@@ -1517,7 +1498,7 @@ where
+ 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)),
+ }
+ }
+@@ -1576,7 +1557,7 @@ where
+ 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),
+ }
+ }
+@@ -1588,7 +1569,7 @@ where
+ 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)),
+ }
+ }
+@@ -1600,7 +1581,7 @@ where
+ 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),
+ }
+ }
+@@ -1681,7 +1662,7 @@ where
+ 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")]
+@@ -1692,7 +1673,7 @@ where
+ 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")]
+@@ -1706,9 +1687,9 @@ where
+ static_token: Token),
+ mutability: (node.mutability).map(|it| Token)),
+ 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")]
+@@ -1721,7 +1702,7 @@ where
+ vis: f.fold_visibility(node.vis),
+ type_token: Token),
+ 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"))]
+@@ -1779,9 +1760,9 @@ 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)),
+ }
+ }
+@@ -1819,11 +1800,11 @@ where
+ defaultness: (node.defaultness).map(|it| Token)),
+ const_token: Token),
+ 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")]
+@@ -1834,7 +1815,7 @@ where
+ 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")]
+@@ -1862,9 +1843,9 @@ where
+ type_token: Token),
+ 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"))]
+@@ -1913,11 +1894,11 @@ where
+ vis: f.fold_visibility(node.vis),
+ const_token: Token),
+ 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")]
+@@ -1952,7 +1933,7 @@ where
+ 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")]
+@@ -2011,7 +1992,7 @@ where
+ 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")]
+@@ -2043,7 +2024,7 @@ where
+ 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")]
+@@ -2057,11 +2038,11 @@ where
+ static_token: Token),
+ mutability: (node.mutability).map(|it| Token)),
+ 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")]
+@@ -2076,7 +2057,7 @@ where
+ 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")]
+@@ -2092,7 +2073,7 @@ where
+ trait_token: Token),
+ 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)),
+@@ -2109,9 +2090,9 @@ where
+ trait_token: Token),
+ 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")]
+@@ -2125,9 +2106,9 @@ where
+ type_token: Token),
+ 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")]
+@@ -2153,9 +2134,9 @@ where
+ attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+ vis: f.fold_visibility(node.vis),
+ use_token: Token),
+- 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")]
+@@ -2165,7 +2146,7 @@ where
+ {
+ 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
+@@ -2185,11 +2166,10 @@ where
+ 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,
+@@ -2205,7 +2185,6 @@ where
+ 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,
+@@ -2215,7 +2194,6 @@ where
+ 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,
+@@ -2225,7 +2203,6 @@ where
+ 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,
+@@ -2235,7 +2212,6 @@ where
+ 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,
+@@ -2245,7 +2221,6 @@ where
+ 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,
+@@ -2255,7 +2230,6 @@ where
+ 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,
+@@ -2265,7 +2239,6 @@ where
+ 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,
+@@ -2286,11 +2259,11 @@ where
+ 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"))]
+@@ -2361,7 +2334,7 @@ where
+ {
+ 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),
+ }
+ }
+@@ -2371,10 +2344,10 @@ 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"))]
+@@ -2449,7 +2422,7 @@ where
+ 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)),
+ )
+ }),
+@@ -2482,7 +2455,7 @@ where
+ {
+ 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)),
+ }
+ }
+@@ -2516,7 +2489,7 @@ where
+ {
+ 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)),
+ pat: Box::new(f.fold_pat(*node.pat)),
+ }
+@@ -2585,7 +2558,7 @@ where
+ 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)),
+ }
+ }
+@@ -2605,7 +2578,7 @@ 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)),
+ }
+ }
+@@ -2641,7 +2614,7 @@ where
+ {
+ 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),
+ }
+ }
+@@ -2652,7 +2625,7 @@ where
+ {
+ 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)),
+ }
+ }
+@@ -2664,7 +2637,7 @@ where
+ 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)),
+ }
+ }
+@@ -2674,11 +2647,11 @@ 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)),
+- gt_token: Token ! [ > ](tokens_helper(f, &node.gt_token.spans)),
++ gt_token: Token ! [>](tokens_helper(f, &node.gt_token.spans)),
+ }
+ }
+ #[cfg(feature = "full")]
+@@ -2691,7 +2664,7 @@ where
+ RangeLimits::HalfOpen(Token))
+ }
+ RangeLimits::Closed(_binding_0) => {
+- RangeLimits::Closed(Token ! [ ..= ](tokens_helper(f, &_binding_0.spans)))
++ RangeLimits::Closed(Token ! [..=](tokens_helper(f, &_binding_0.spans)))
+ }
+ }
+ }
+@@ -2704,7 +2677,7 @@ where
+ 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)),
+ )
+ }),
+@@ -2720,7 +2693,7 @@ where
+ 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)),
+ ),
+ }
+@@ -2761,7 +2734,7 @@ where
+ 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)),
+ ),
+ }
+ }
+@@ -2785,7 +2758,7 @@ where
+ 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)))
+ }
+ }
+ }
+@@ -2812,15 +2785,15 @@ where
+ attrs: FoldHelper::lift(node.attrs, |it| f.fold_attribute(it)),
+ const_token: Token),
+ 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")]
+@@ -2831,7 +2804,7 @@ where
+ 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")]
+@@ -2843,7 +2816,7 @@ where
+ 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")]
+@@ -2856,15 +2829,15 @@ where
+ type_token: Token),
+ 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"))]
+@@ -2899,7 +2872,7 @@ where
+ 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),
+ }
+ }
+@@ -2974,9 +2947,9 @@ where
+ 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)),
+ }
+ }
+@@ -3018,7 +2991,7 @@ 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)),
+ mutability: (node.mutability).map(|it| Token)),
+ elem: Box::new(f.fold_type(*node.elem)),
+@@ -3030,7 +3003,7 @@ 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)),
+ elem: Box::new(f.fold_type(*node.elem)),
+@@ -3072,9 +3045,9 @@ 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)),
+- 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")]
+@@ -3083,7 +3056,7 @@ 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")]
+@@ -3112,7 +3085,7 @@ where
+ {
+ 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)),
+ }
+ }
+@@ -3147,7 +3120,7 @@ where
+ {
+ 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"))]
+@@ -3161,7 +3134,7 @@ where
+ 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),
+ )
+ }),
+diff --git a/third_party/rust/syn/src/gen/hash.rs b/third_party/rust/syn/src/gen/hash.rs
+new file mode 100644
+index 0000000..9e9e84a
+--- /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
+index b667f53..24d34b7 100644
+--- a/third_party/rust/syn/src/gen/visit.rs
++++ b/third_party/rust/syn/src/gen/visit.rs
+@@ -20,7 +20,6 @@ macro_rules! full {
+ unreachable!()
+ };
+ }
+-#[cfg(any(feature = "full", feature = "derive"))]
+ macro_rules! skip {
+ ($($tt:tt)*) => {};
+ }
+@@ -30,7 +29,7 @@ macro_rules! skip {
+ ///
+ /// [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) {
+@@ -434,35 +433,27 @@ pub trait Visit<'ast> {
+ 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)
+ }
+@@ -2537,7 +2528,6 @@ where
+ }
+ }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit<'ast, V>(v: &mut V, node: &'ast Lit)
+ where
+ V: Visit<'ast> + ?Sized,
+@@ -2569,7 +2559,6 @@ where
+ }
+ }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_bool<'ast, V>(v: &mut V, node: &'ast LitBool)
+ where
+ V: Visit<'ast> + ?Sized,
+@@ -2577,37 +2566,31 @@ where
+ 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,
+diff --git a/third_party/rust/syn/src/gen/visit_mut.rs b/third_party/rust/syn/src/gen/visit_mut.rs
+index 5cddb82..5ce11f0 100644
+--- a/third_party/rust/syn/src/gen/visit_mut.rs
++++ b/third_party/rust/syn/src/gen/visit_mut.rs
+@@ -20,7 +20,6 @@ macro_rules! full {
+ unreachable!()
+ };
+ }
+-#[cfg(any(feature = "full", feature = "derive"))]
+ macro_rules! skip {
+ ($($tt:tt)*) => {};
+ }
+@@ -31,7 +30,7 @@ macro_rules! skip {
+ ///
+ /// [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) {
+@@ -438,35 +437,27 @@ pub trait VisitMut {
+ 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)
+ }
+@@ -2543,7 +2534,6 @@ where
+ }
+ }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_mut<V>(v: &mut V, node: &mut Lit)
+ where
+ V: VisitMut + ?Sized,
+@@ -2575,7 +2565,6 @@ where
+ }
+ }
+ }
+-#[cfg(any(feature = "derive", feature = "full"))]
+ pub fn visit_lit_bool_mut<V>(v: &mut V, node: &mut LitBool)
+ where
+ V: VisitMut + ?Sized,
+@@ -2583,37 +2572,31 @@ where
+ 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,
+diff --git a/third_party/rust/syn/src/generics.rs b/third_party/rust/syn/src/generics.rs
+index 95ab2e4..05e8ef5 100644
+--- a/third_party/rust/syn/src/generics.rs
++++ b/third_party/rust/syn/src/generics.rs
+@@ -1,13 +1,16 @@
+ 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![,]>,
+@@ -20,7 +23,7 @@ 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
+@@ -28,9 +31,6 @@ ast_enum_of_structs! {
+ /// 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),
+@@ -46,7 +46,7 @@ ast_enum_of_structs! {
+ 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>,
+@@ -61,7 +61,7 @@ ast_struct! {
+ 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>,
+@@ -74,7 +74,7 @@ ast_struct! {
+ 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>,
+@@ -87,6 +87,17 @@ ast_struct! {
+ }
+ }
+
++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
+@@ -280,29 +291,23 @@ impl<'a> Iterator for ConstParamsMut<'a> {
+
+ /// 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")]
+@@ -314,9 +319,8 @@ impl Generics {
+ /// # 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! {
+@@ -324,11 +328,10 @@ impl Generics {
+ /// // ...
+ /// }
+ /// }
+- /// # ;
+- /// # }
++ /// # ;
+ /// ```
+ ///
+- /// *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>) {
+ (
+@@ -339,11 +342,57 @@ impl Generics {
+ }
+ }
+
++#[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)
+@@ -353,9 +402,8 @@ impl<'a> TypeGenerics<'a> {
+ 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![<],
+@@ -364,6 +412,17 @@ ast_struct! {
+ }
+ }
+
++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 {
+@@ -391,7 +450,7 @@ impl From<Ident> for TypeParam {
+ 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),
+@@ -402,7 +461,7 @@ ast_enum_of_structs! {
+ 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>,
+@@ -418,9 +477,8 @@ 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![?]),
+@@ -431,7 +489,7 @@ 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],
+@@ -442,7 +500,7 @@ ast_struct! {
+ 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
+@@ -450,9 +508,6 @@ ast_enum_of_structs! {
+ /// 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),
+@@ -468,7 +523,7 @@ ast_enum_of_structs! {
+ 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
+@@ -484,7 +539,7 @@ ast_struct! {
+ 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,
+@@ -496,7 +551,7 @@ ast_struct! {
+ 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,
+@@ -521,7 +576,6 @@ pub mod parsing {
+
+ let mut params = Punctuated::new();
+ let mut allow_lifetime_param = true;
+- let mut allow_type_param = true;
+ loop {
+ if input.peek(Token![>]) {
+ break;
+@@ -534,7 +588,7 @@ pub mod parsing {
+ 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,
+@@ -542,7 +596,6 @@ pub mod parsing {
+ }));
+ } else if lookahead.peek(Token![const]) {
+ allow_lifetime_param = false;
+- allow_type_param = false;
+ params.push_value(GenericParam::Const(ConstParam {
+ attrs,
+ ..input.parse()?
+@@ -665,57 +718,53 @@ pub mod parsing {
+
+ 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
+- }
+- },
+- 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);
+- }
++ 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;
+ }
+- bounds
+- },
+- eq_token: {
+- if input.peek(Token![=]) {
+- has_default = true;
+- Some(input.parse()?)
+- } else {
+- has_default = false;
+- None
++ if input.peek(Token![?]) && input.peek2(Token![const]) {
++ input.parse::<Token![?]>()?;
++ input.parse::<Token![const]>()?;
++ is_maybe_const = true;
+ }
+- },
+- default: {
+- if has_default {
+- Some(input.parse()?)
+- } else {
+- None
++ let value: TypeParamBound = input.parse()?;
++ bounds.push_value(value);
++ if !input.peek(Token![+]) {
++ break;
+ }
+- },
++ 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,
+ })
+ }
+ }
+@@ -898,6 +947,8 @@ mod printing {
+ use super::*;
+
+ use proc_macro2::TokenStream;
++ #[cfg(feature = "full")]
++ use proc_macro2::TokenTree;
+ use quote::{ToTokens, TokenStreamExt};
+
+ use crate::attr::FilterAttrs;
+@@ -1080,9 +1131,25 @@ mod printing {
+ 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);
+ }
+ }
+ }
+@@ -1117,9 +1184,9 @@ mod printing {
+ 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);
+ }
+ }
+ }
+diff --git a/third_party/rust/syn/src/item.rs b/third_party/rust/syn/src/item.rs
+index ff4485a..0d8f7d3 100644
+--- a/third_party/rust/syn/src/item.rs
++++ b/third_party/rust/syn/src/item.rs
+@@ -1,17 +1,15 @@
+ 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
+ ///
+@@ -21,7 +19,7 @@ ast_enum_of_structs! {
+ //
+ // 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),
+
+@@ -83,7 +81,7 @@ ast_enum_of_structs! {
+ 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,
+@@ -100,7 +98,7 @@ ast_struct! {
+ 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,
+@@ -115,7 +113,7 @@ ast_struct! {
+ 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,
+@@ -131,7 +129,7 @@ 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,
+@@ -143,7 +141,7 @@ ast_struct! {
+ 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,
+@@ -156,7 +154,7 @@ 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]>,
+@@ -175,7 +173,7 @@ ast_struct! {
+ 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 { ... }`.
+@@ -188,8 +186,8 @@ ast_struct! {
+ 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],
+@@ -201,7 +199,7 @@ ast_struct! {
+ 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,
+@@ -215,7 +213,7 @@ ast_struct! {
+ 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,
+@@ -233,7 +231,7 @@ ast_struct! {
+ 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,
+@@ -248,7 +246,7 @@ ast_struct! {
+ 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,
+@@ -267,7 +265,7 @@ ast_struct! {
+ 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,
+@@ -283,7 +281,7 @@ ast_struct! {
+ 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,
+@@ -299,7 +297,7 @@ ast_struct! {
+ 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,
+@@ -313,7 +311,7 @@ ast_struct! {
+ 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,
+@@ -324,145 +322,32 @@ ast_struct! {
+ }
+ }
+
+-#[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 {
+@@ -496,10 +381,57 @@ impl From<DeriveInput> for Item {
+ }
+ }
+
++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
+ ///
+@@ -530,7 +462,7 @@ ast_enum_of_structs! {
+ 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![::],
+@@ -541,7 +473,7 @@ ast_struct! {
+ 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,
+ }
+@@ -550,7 +482,7 @@ ast_struct! {
+ 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],
+@@ -561,7 +493,7 @@ ast_struct! {
+ 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![*],
+ }
+@@ -570,7 +502,7 @@ ast_struct! {
+ 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![,]>,
+@@ -580,7 +512,7 @@ ast_struct! {
+ 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
+ ///
+@@ -590,7 +522,7 @@ ast_enum_of_structs! {
+ //
+ // 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),
+
+@@ -614,7 +546,7 @@ ast_enum_of_structs! {
+ 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,
+@@ -626,7 +558,7 @@ ast_struct! {
+ 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,
+@@ -642,7 +574,7 @@ ast_struct! {
+ 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,
+@@ -655,7 +587,7 @@ ast_struct! {
+ 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,
+@@ -663,61 +595,10 @@ ast_struct! {
+ }
+ }
+
+-#[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
+ ///
+@@ -727,7 +608,7 @@ ast_enum_of_structs! {
+ //
+ // 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),
+
+@@ -751,7 +632,7 @@ ast_enum_of_structs! {
+ 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],
+@@ -766,7 +647,7 @@ ast_struct! {
+ 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,
+@@ -778,7 +659,7 @@ ast_struct! {
+ 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],
+@@ -794,7 +675,7 @@ ast_struct! {
+ 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,
+@@ -802,61 +683,10 @@ ast_struct! {
+ }
+ }
+
+-#[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
+ ///
+@@ -866,7 +696,7 @@ ast_enum_of_structs! {
+ //
+ // 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),
+
+@@ -890,7 +720,7 @@ ast_enum_of_structs! {
+ 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,
+@@ -908,7 +738,7 @@ ast_struct! {
+ 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,
+@@ -921,7 +751,7 @@ ast_struct! {
+ 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,
+@@ -938,7 +768,7 @@ ast_struct! {
+ 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,
+@@ -946,62 +776,11 @@ ast_struct! {
+ }
+ }
+
+-#[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]>,
+@@ -1017,13 +796,34 @@ ast_struct! {
+ }
+ }
+
++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.
+@@ -1035,7 +835,10 @@ 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>)>,
+@@ -1056,7 +859,8 @@ pub mod parsing {
+
+ 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};
+
+@@ -1064,18 +868,26 @@ pub mod parsing {
+
+ 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) {
+@@ -1083,8 +895,6 @@ pub mod parsing {
+ 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())
+ }
+@@ -1094,18 +904,61 @@ pub mod parsing {
+ } 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())
+ }
+@@ -1117,21 +970,19 @@ pub mod parsing {
+ {
+ 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]) {
+@@ -1147,14 +998,18 @@ pub mod parsing {
+ } 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![::]))
+ {
+@@ -1163,32 +1018,64 @@ pub mod parsing {
+ 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,
++ })
+ }
+ }
+
+@@ -1310,7 +1197,6 @@ pub mod parsing {
+ || 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![::]) {
+@@ -1392,69 +1278,126 @@ pub mod parsing {
+ }
+ }
+
+- 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()?;
++ fn pop_variadic(args: &mut Punctuated<FnArg, Token![,]>) -> Option<Variadic> {
++ let trailing_punct = args.trailing_punct();
+
+- 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 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();
+ }
++ }
+
+- let output: ReturnType = input.parse()?;
+- let where_clause: Option<WhereClause> = input.parse()?;
++ Some(variadic)
++ }
+
+- 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 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
++ }),
++ ])
++ }
+
+- 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 }),
+- })
++ 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 sig = parse_signature(input)?;
++ parse_rest_of_fn(input, outer_attrs, vis, sig)
+ }
+ }
+
++ 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,
++ block: Box::new(Block { brace_token, stmts }),
++ })
++ }
++
+ impl Parse for FnArg {
+ fn parse(input: ParseStream) -> Result<Self> {
+ let attrs = input.call(Attribute::parse_outer)?;
+@@ -1491,26 +1434,79 @@ pub mod parsing {
+ }
+ }
+
++ 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,
++ 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,
++ })),
++ colon_token: Token,
++ 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()?,
+ }),
+ })
+@@ -1581,22 +1577,60 @@ pub mod parsing {
+
+ 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![::]))
+ {
+@@ -1605,17 +1639,16 @@ pub mod parsing {
+ 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)
+ }
+@@ -1625,55 +1658,12 @@ pub mod parsing {
+ 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,
+ })
+ }
+@@ -1706,6 +1696,37 @@ pub mod parsing {
+ }
+ }
+
++ 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)?;
+@@ -1742,6 +1763,36 @@ pub mod parsing {
+ }
+ }
+
++ 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"))
+@@ -1887,7 +1938,7 @@ pub mod parsing {
+
+ 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()?;
+@@ -1896,7 +1947,7 @@ pub mod parsing {
+ let generics: Generics = input.parse()?;
+ parse_rest_of_trait(
+ input,
+- attrs,
++ outer_attrs,
+ vis,
+ unsafety,
+ auto_token,
+@@ -1909,7 +1960,7 @@ pub mod parsing {
+
+ 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]>,
+@@ -1937,13 +1988,14 @@ pub mod parsing {
+
+ 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,
+@@ -2014,14 +2066,19 @@ pub mod parsing {
+
+ 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])
+@@ -2032,18 +2089,11 @@ pub mod parsing {
+ } 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![::])
+ {
+@@ -2052,18 +2102,20 @@ pub mod parsing {
+ 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)
+ }
+ }
+@@ -2073,7 +2125,14 @@ pub mod parsing {
+ 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: {
+@@ -2093,20 +2152,7 @@ pub mod parsing {
+ 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) {
+@@ -2124,22 +2170,7 @@ pub mod parsing {
+
+ 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,
+ })
+@@ -2188,6 +2219,35 @@ pub mod parsing {
+ }
+ }
+
++ 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)?;
+@@ -2207,52 +2267,67 @@ pub mod parsing {
+
+ 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 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 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 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![>]))
++ || input.peek2(Token![const]));
++ let generics: Generics = if has_generics {
++ input.parse()?
++ } else {
++ Generics::default()
++ };
+
+- let content;
+- let brace_token = braced!(content in input);
+- let inner_attrs = content.call(Attribute::parse_inner)?;
++ 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 mut items = Vec::new();
+- while !content.is_empty() {
+- items.push(content.parse()?);
++ 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 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)?;
++
++ let mut items = Vec::new();
++ while !content.is_empty() {
++ items.push(content.parse()?);
++ }
+
+- Ok(ItemImpl {
++ if is_const_impl {
++ Ok(None)
++ } else {
++ Ok(Some(ItemImpl {
+ attrs: private::attrs(outer_attrs, inner_attrs),
+ defaultness,
+ unsafety,
+@@ -2265,12 +2340,13 @@ pub mod parsing {
+ 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()?;
+@@ -2284,28 +2360,38 @@ pub mod parsing {
+ 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()
+@@ -2313,7 +2399,6 @@ pub mod parsing {
+ && (lookahead.peek(Ident)
+ || lookahead.peek(Token![self])
+ || lookahead.peek(Token![super])
+- || lookahead.peek(Token![extern])
+ || lookahead.peek(Token![crate])
+ || lookahead.peek(Token![::]))
+ {
+@@ -2346,7 +2431,14 @@ pub mod parsing {
+ 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()?,
+@@ -2358,50 +2450,39 @@ pub mod parsing {
+
+ 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 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 sig = parse_signature(input)?;
++
++ 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,
+ })
+ }
+ }
+@@ -2426,6 +2507,37 @@ pub mod parsing {
+ }
+ }
+
++ 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)?;
+@@ -2471,6 +2583,7 @@ mod printing {
+
+ use crate::attr::FilterAttrs;
+ use crate::print::TokensOrDefault;
++ use crate::punctuated::Pair;
+
+ impl ToTokens for ItemExternCrate {
+ fn to_tokens(&self, tokens: &mut TokenStream) {
+@@ -2835,6 +2948,14 @@ mod printing {
+ 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);
+@@ -2905,6 +3026,33 @@ mod printing {
+ }
+ }
+
++ 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);
+@@ -2915,11 +3063,24 @@ mod printing {
+ 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);
++ }
++ }
++ }
++ 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.variadic.to_tokens(tokens);
+ });
+ self.output.to_tokens(tokens);
+ self.generics.where_clause.to_tokens(tokens);
+diff --git a/third_party/rust/syn/src/keyword.rs b/third_party/rust/syn/src/keyword.rs
+deleted file mode 100644
+index e69de29..0000000
+diff --git a/third_party/rust/syn/src/lib.rs b/third_party/rust/syn/src/lib.rs
+index c8ada7e..3da5067 100644
+--- a/third_party/rust/syn/src/lib.rs
++++ b/third_party/rust/syn/src/lib.rs
+@@ -1,3 +1,11 @@
++//! [![github]](https://github.com/dtolnay/syn) [![crates-io]](https://crates.io/crates/syn) [![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.
+ //!
+@@ -62,8 +70,8 @@
+ //! ```
+ //!
+ //! ```
+-//! extern crate proc_macro;
+-//!
++//! # extern crate proc_macro;
++//! #
+ //! use proc_macro::TokenStream;
+ //! use quote::quote;
+ //! use syn::{parse_macro_input, DeriveInput};
+@@ -242,35 +250,48 @@
+ //! 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(
+@@ -284,7 +305,6 @@ extern crate unicode_xid;
+ #[cfg(feature = "printing")]
+ extern crate quote;
+
+-#[cfg(any(feature = "full", feature = "derive"))]
+ #[macro_use]
+ mod macros;
+
+@@ -307,7 +327,6 @@ 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"))]
+@@ -364,9 +383,7 @@ 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,
+ };
+@@ -441,6 +458,9 @@ 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.
+ ///
+@@ -482,7 +502,7 @@ mod gen {
+ /// /* ... */
+ /// ```
+ ///
+- /// *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>
+ ///
+@@ -603,7 +623,7 @@ mod gen {
+ /// /* ... */
+ /// ```
+ ///
+- /// *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>
+@@ -702,7 +722,7 @@ mod gen {
+ /// /* ... */
+ /// ```
+ ///
+- /// *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>
+ ///
+@@ -744,6 +764,22 @@ mod gen {
+ #[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;
+@@ -757,6 +793,8 @@ pub mod export;
+ mod custom_keyword;
+ mod custom_punctuation;
+ mod sealed;
++mod span;
++mod thread;
+
+ #[cfg(feature = "parsing")]
+ mod lookahead;
+@@ -764,13 +802,15 @@ 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)]
+@@ -800,14 +840,14 @@ pub use crate::error::{Error, Result};
+ ///
+ /// [`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;
+@@ -847,7 +887,7 @@ pub fn parse<T: parse::Parse>(tokens: proc_macro::TokenStream) -> Result<T> {
+ ///
+ /// [`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)
+@@ -855,7 +895,7 @@ pub fn parse2<T: parse::Parse>(tokens: proc_macro2::TokenStream) -> Result<T> {
+
+ /// 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
+ ///
+@@ -874,9 +914,7 @@ pub fn parse2<T: parse::Parse>(tokens: proc_macro2::TokenStream) -> Result<T> {
+ /// Ok(())
+ /// }
+ /// #
+-/// # fn main() {
+-/// # run().unwrap();
+-/// # }
++/// # run().unwrap();
+ /// ```
+ #[cfg(feature = "parsing")]
+ pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T> {
+@@ -894,7 +932,7 @@ pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T> {
+ ///
+ /// 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
+@@ -918,9 +956,7 @@ pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T> {
+ /// Ok(())
+ /// }
+ /// #
+-/// # fn main() {
+-/// # run().unwrap();
+-/// # }
++/// # run().unwrap();
+ /// ```
+ #[cfg(all(feature = "parsing", feature = "full"))]
+ pub fn parse_file(mut content: &str) -> Result<File> {
+@@ -931,13 +967,16 @@ pub fn parse_file(mut content: &str) -> Result<File> {
+ }
+
+ 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 = "";
++ }
+ }
+ }
+
+diff --git a/third_party/rust/syn/src/lifetime.rs b/third_party/rust/syn/src/lifetime.rs
+index d51c48e..959cc5f 100644
+--- a/third_party/rust/syn/src/lifetime.rs
++++ b/third_party/rust/syn/src/lifetime.rs
+@@ -18,10 +18,8 @@ use crate::lookahead;
+ /// - 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,
+@@ -72,6 +70,15 @@ impl Display for Lifetime {
+ }
+ }
+
++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)
+diff --git a/third_party/rust/syn/src/lit.rs b/third_party/rust/syn/src/lit.rs
+index f2209a2..ee77e75 100644
+--- a/third_party/rust/syn/src/lit.rs
++++ b/third_party/rust/syn/src/lit.rs
+@@ -22,9 +22,6 @@ 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].
+@@ -33,7 +30,7 @@ ast_enum_of_structs! {
+ //
+ // 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),
+
+@@ -64,61 +61,44 @@ ast_enum_of_structs! {
+
+ 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>,
+@@ -129,15 +109,11 @@ 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>,
+@@ -146,92 +122,27 @@ struct LitFloatRepr {
+
+ 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)
+ }
+
+@@ -311,7 +222,7 @@ impl LitStr {
+ 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);
+ }
+@@ -345,19 +256,30 @@ 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
+ }
+ }
+
+@@ -365,19 +287,30 @@ 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
+ }
+ }
+
+@@ -385,36 +318,52 @@ 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,
++ }),
+ }
+ }
+
+@@ -492,18 +441,23 @@ impl Display for LitInt {
+
+ 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,
++ }),
+ }
+ }
+
+@@ -575,7 +529,7 @@ mod debug_impls {
+ 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()
+ }
+ }
+@@ -584,7 +538,7 @@ mod debug_impls {
+ 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()
+ }
+ }
+@@ -593,7 +547,7 @@ mod debug_impls {
+ 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()
+ }
+ }
+@@ -626,15 +580,53 @@ mod debug_impls {
+ }
+ }
+
++#[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()
+ }
+ }
+
+@@ -644,7 +636,7 @@ macro_rules! lit_extra_traits {
+ where
+ H: Hasher,
+ {
+- self.$($field).+.to_string().hash(state);
++ self.repr.token.to_string().hash(state);
+ }
+ }
+
+@@ -657,20 +649,23 @@ macro_rules! lit_extra_traits {
+ };
+ }
+
+-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,
+@@ -691,7 +686,9 @@ pub fn Lit(marker: lookahead::TokenMarker) -> Lit {
+ #[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> {
+@@ -699,25 +696,73 @@ pub mod parsing {
+ 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();
+@@ -803,19 +848,19 @@ mod printing {
+
+ 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);
+ }
+ }
+
+@@ -855,20 +900,29 @@ mod value {
+ 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")) {
+@@ -905,6 +959,44 @@ 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
+@@ -1004,19 +1096,18 @@ mod value {
+ 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),
+@@ -1028,25 +1119,25 @@ mod value {
+ // 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',
+@@ -1057,10 +1148,10 @@ mod value {
+ 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;
+ }
+@@ -1069,42 +1160,45 @@ mod value {
+ }
+ }
+ 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',
+@@ -1118,16 +1212,18 @@ mod value {
+ }
+ }
+ 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..];
+
+@@ -1163,8 +1259,9 @@ mod value {
+ 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)
+@@ -1334,7 +1431,11 @@ mod value {
+ }
+ b'e' | b'E' => {
+ if has_e {
+- return None;
++ if has_exponent {
++ break;
++ } else {
++ return None;
++ }
+ }
+ has_e = true;
+ bytes[write] = b'e';
+@@ -1372,11 +1473,33 @@ mod value {
+ }
+ }
+
+- 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
+index 6c3dcae..de288a3 100644
+--- a/third_party/rust/syn/src/mac.rs
++++ b/third_party/rust/syn/src/mac.rs
+@@ -2,21 +2,17 @@ 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,
+@@ -27,7 +23,7 @@ ast_struct! {
+ 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),
+@@ -36,39 +32,20 @@ ast_enum! {
+ }
+ }
+
+-#[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 {
+@@ -163,9 +140,7 @@ impl Macro {
+ /// 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())
+ }
+ }
+diff --git a/third_party/rust/syn/src/macros.rs b/third_party/rust/syn/src/macros.rs
+index 9cac5c1..8060224 100644
+--- a/third_party/rust/syn/src/macros.rs
++++ b/third_party/rust/syn/src/macros.rs
+@@ -4,15 +4,11 @@ macro_rules! ast_struct {
+ 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"))]
+@@ -23,29 +19,10 @@ macro_rules! ast_struct {
+ }
+ };
+
+- (
+- [$($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)*
+ };
+
+@@ -63,21 +40,10 @@ macro_rules! ast_enum {
+ 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)*
+ );
+
+@@ -120,15 +86,9 @@ macro_rules! ast_enum_of_structs_impl {
+ 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! {
+@@ -140,6 +100,19 @@ macro_rules! ast_enum_of_structs_impl {
+ };
+ }
+
++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)*) => ();
+diff --git a/third_party/rust/syn/src/op.rs b/third_party/rust/syn/src/op.rs
+index 49fb853..d254673 100644
+--- a/third_party/rust/syn/src/op.rs
++++ b/third_party/rust/syn/src/op.rs
+@@ -1,9 +1,8 @@
+ 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![+]),
+@@ -67,9 +66,8 @@ ast_enum! {
+ 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![*]),
+diff --git a/third_party/rust/syn/src/parse.rs b/third_party/rust/syn/src/parse.rs
+index 7c7b194..abb4c4c 100644
+--- a/third_party/rust/syn/src/parse.rs
++++ b/third_party/rust/syn/src/parse.rs
+@@ -26,8 +26,8 @@
+ //! [`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};
+@@ -109,9 +109,7 @@
+ //! # Ok(())
+ //! # }
+ //! #
+-//! # fn main() {
+-//! # run_parser().unwrap();
+-//! # }
++//! # run_parser().unwrap();
+ //! ```
+ //!
+ //! The [`parse_quote!`] macro also uses this approach.
+@@ -155,8 +153,8 @@
+ //! [`Parser`]: trait.Parser.html
+ //!
+ //! ```
+-//! extern crate proc_macro;
+-//!
++//! # extern crate proc_macro;
++//! #
+ //! use proc_macro::TokenStream;
+ //! use syn::parse::Parser;
+ //! use syn::punctuated::Punctuated;
+@@ -186,7 +184,7 @@
+ //!
+ //! ---
+ //!
+-//! *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;
+@@ -217,6 +215,11 @@ 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>;
+ }
+@@ -263,13 +266,16 @@ pub struct ParseBuffer<'a> {
+ // 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));
++ }
+ }
+ }
+ }
+@@ -324,15 +330,12 @@ impl<'a> Debug for ParseBuffer<'a> {
+ /// # 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.
+@@ -356,6 +359,14 @@ impl<'c, 'a> Deref for StepCursor<'c, 'a> {
+ }
+ }
+
++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.
+ ///
+@@ -375,36 +386,81 @@ pub(crate) fn advance_step_cursor<'c, 'a>(proof: StepCursor<'c, 'a>, to: Cursor<
+ 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
+ }
+ }
+
+-pub(crate) fn get_unexpected(buffer: &ParseBuffer) -> Rc<Cell<Option<Span>>> {
+- buffer.unexpected.clone()
++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()),
++ }
++ }
++}
++
++// 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> {
+@@ -566,14 +622,17 @@ impl<'a> ParseBuffer<'a> {
+ /// }
+ /// ```
+ 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
+@@ -615,12 +674,10 @@ impl<'a> ParseBuffer<'a> {
+ /// }
+ /// }
+ /// #
+- /// # 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,
+@@ -847,8 +904,8 @@ impl<'a> ParseBuffer<'a> {
+ 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)))),
+ }
+ }
+
+@@ -923,13 +980,11 @@ impl<'a> ParseBuffer<'a> {
+ /// # 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
+@@ -961,6 +1016,18 @@ impl<'a> ParseBuffer<'a> {
+ 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.
+ ///
+@@ -971,7 +1038,7 @@ impl<'a> ParseBuffer<'a> {
+ }
+
+ fn check_unexpected(&self) -> Result<()> {
+- match self.unexpected.get() {
++ match inner_unexpected(self).1 {
+ Some(span) => Err(Error::new(span, "unexpected token")),
+ None => Ok(()),
+ }
+@@ -1048,7 +1115,7 @@ impl Parse for Literal {
+ ///
+ /// [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;
+
+@@ -1063,7 +1130,7 @@ pub trait Parser: Sized {
+ /// 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"))),
+@@ -1088,6 +1155,7 @@ pub trait Parser: Sized {
+
+ // 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)
+@@ -1095,6 +1163,7 @@ pub trait Parser: Sized {
+
+ // 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))
+ }
+@@ -1103,7 +1172,7 @@ pub trait Parser: Sized {
+ 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)
+ }
+
+@@ -1118,38 +1187,42 @@ where
+ let state = tokens_to_parse_buffer(&buf);
+ let node = self(&state)?;
+ state.check_unexpected()?;
+- if state.is_empty() {
+- Ok(node)
++ if let Some(unexpected_span) = span_of_unexpected_ignoring_nones(state.cursor()) {
++ Err(Error::new(unexpected_span, "unexpected token"))
+ } else {
+- Err(state.error("unexpected token"))
++ Ok(node)
+ }
+ }
+
+ #[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() {
+- Ok(node)
++ if let Some(unexpected_span) = span_of_unexpected_ignoring_nones(state.cursor()) {
++ Err(Error::new(unexpected_span, "unexpected token"))
+ } else {
+- Err(state.error("unexpected token"))
++ Ok(node)
+ }
+ }
+
+ #[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)
+ }
+@@ -1160,8 +1233,8 @@ pub(crate) fn parse_stream<F: Parser>(f: F, input: ParseStream) -> Result<F::Out
+ /// 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;
+diff --git a/third_party/rust/syn/src/parse_macro_input.rs b/third_party/rust/syn/src/parse_macro_input.rs
+index d6e0725..c8fc1ce 100644
+--- a/third_party/rust/syn/src/parse_macro_input.rs
++++ b/third_party/rust/syn/src/parse_macro_input.rs
+@@ -16,8 +16,8 @@
+ /// #\[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};
+@@ -43,7 +43,31 @@
+ /// # "".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) {
+@@ -54,7 +78,7 @@ macro_rules! parse_macro_input {
+ }
+ };
+ ($tokenstream:ident) => {
+- parse_macro_input!($tokenstream as _)
++ $crate::parse_macro_input!($tokenstream as _)
+ };
+ }
+
+diff --git a/third_party/rust/syn/src/parse_quote.rs b/third_party/rust/syn/src/parse_quote.rs
+index 18a47b9..66aa818 100644
+--- a/third_party/rust/syn/src/parse_quote.rs
++++ b/third_party/rust/syn/src/parse_quote.rs
+@@ -24,7 +24,7 @@
+ /// }
+ /// ```
+ ///
+-/// *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.*
+ ///
+@@ -56,8 +56,10 @@
+ /// 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
+ ///
+@@ -67,7 +69,7 @@
+ //
+ // 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(
+@@ -112,6 +114,8 @@ impl<T: Parse> ParseQuote for T {
+ 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 {
+@@ -129,3 +133,10 @@ impl<T: Parse, P: Parse> ParseQuote for Punctuated<T, P> {
+ 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
+index 9371e05..e9576a2 100644
+--- a/third_party/rust/syn/src/pat.rs
++++ b/third_party/rust/syn/src/pat.rs
+@@ -1,16 +1,12 @@
+ 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
+ ///
+@@ -20,7 +16,7 @@ ast_enum_of_structs! {
+ //
+ // 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),
+
+@@ -86,7 +82,7 @@ ast_enum_of_structs! {
+ 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],
+@@ -97,7 +93,10 @@ ast_struct! {
+ 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]>,
+@@ -113,7 +112,7 @@ ast_struct! {
+ /// 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>,
+@@ -123,7 +122,7 @@ ast_struct! {
+ 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,
+@@ -133,7 +132,7 @@ ast_struct! {
+ 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![|]>,
+@@ -150,7 +149,7 @@ ast_struct! {
+ /// `<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>,
+@@ -161,7 +160,7 @@ ast_struct! {
+ 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>,
+@@ -173,7 +172,7 @@ ast_struct! {
+ 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![&],
+@@ -185,7 +184,7 @@ ast_struct! {
+ 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![..],
+@@ -195,7 +194,7 @@ ast_struct! {
+ 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,
+@@ -206,7 +205,7 @@ ast_struct! {
+ 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,
+@@ -219,7 +218,7 @@ ast_struct! {
+ 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,
+@@ -230,7 +229,7 @@ ast_struct! {
+ 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,
+@@ -241,7 +240,7 @@ ast_struct! {
+ 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>,
+@@ -253,7 +252,7 @@ ast_struct! {
+ 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![_],
+@@ -266,7 +265,7 @@ ast_struct! {
+ /// 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,
+@@ -275,122 +274,17 @@ ast_struct! {
+ }
+ }
+
+-#[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)
+ && ({
+@@ -411,7 +305,6 @@ mod parsing {
+ || 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)
+@@ -434,7 +327,7 @@ mod parsing {
+ } 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())
+ }
+@@ -442,10 +335,11 @@ mod parsing {
+ }
+
+ 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() {
+@@ -487,7 +381,7 @@ mod parsing {
+ } 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(),
+@@ -546,7 +440,7 @@ mod parsing {
+ 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()?;
+@@ -578,6 +472,7 @@ mod parsing {
+ }
+
+ 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()?;
+@@ -587,10 +482,10 @@ mod parsing {
+ || member.is_unnamed()
+ {
+ return Ok(FieldPat {
+- attrs: Vec::new(),
++ attrs,
+ member,
+ colon_token: input.parse()?,
+- pat: input.parse()?,
++ pat: Box::new(multi_pat(input)?),
+ });
+ }
+
+@@ -610,30 +505,57 @@ mod parsing {
+ if let Some(boxed) = boxed {
+ pat = Pat::Box(PatBox {
+ attrs: Vec::new(),
+- pat: Box::new(pat),
+ box_token: boxed,
++ pat: Box::new(pat),
+ });
+ }
+
+ Ok(FieldPat {
++ attrs,
+ member: Member::Named(ident),
+- pat: Box::new(pat),
+- attrs: Vec::new(),
+ colon_token: None,
++ pat: Box::new(pat),
+ })
+ }
+
+- 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> {
+@@ -642,7 +564,7 @@ mod parsing {
+
+ 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;
+@@ -668,14 +590,21 @@ mod parsing {
+ }
+
+ 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(),
+@@ -684,7 +613,17 @@ mod parsing {
+ }
+ }
+
+- 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();
+@@ -696,7 +635,6 @@ mod parsing {
+ || lookahead.peek(Token![self])
+ || lookahead.peek(Token![Self])
+ || lookahead.peek(Token![super])
+- || lookahead.peek(Token![extern])
+ || lookahead.peek(Token![crate])
+ {
+ Expr::Path(input.parse()?)
+@@ -704,7 +642,7 @@ mod parsing {
+ 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),
+@@ -712,7 +650,7 @@ mod parsing {
+ })
+ } else {
+ expr
+- }))
++ })))
+ }
+
+ fn pat_slice(input: ParseStream) -> Result<PatSlice> {
+@@ -721,7 +659,7 @@ mod parsing {
+
+ 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;
+@@ -737,11 +675,35 @@ mod parsing {
+ })
+ }
+
+- 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)
+ }
+ }
+
+@@ -756,12 +718,14 @@ mod printing {
+
+ 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);
+@@ -774,6 +738,7 @@ mod printing {
+
+ 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);
+@@ -788,6 +753,7 @@ mod printing {
+
+ 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);
+ }
+@@ -804,12 +770,14 @@ mod printing {
+
+ 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);
+ });
+@@ -818,6 +786,7 @@ mod printing {
+
+ 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);
+ }
+@@ -825,6 +794,7 @@ mod printing {
+
+ 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);
+@@ -833,18 +803,21 @@ mod printing {
+
+ 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),
+@@ -856,6 +829,7 @@ mod printing {
+
+ 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);
+ });
+@@ -864,12 +838,14 @@ mod printing {
+
+ 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);
+ }
+@@ -877,6 +853,7 @@ mod printing {
+
+ 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);
+diff --git a/third_party/rust/syn/src/path.rs b/third_party/rust/syn/src/path.rs
+index 8dda43e..15c0fcc 100644
+--- a/third_party/rust/syn/src/path.rs
++++ b/third_party/rust/syn/src/path.rs
+@@ -2,9 +2,9 @@ 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![::]>,
+@@ -29,7 +29,7 @@ where
+ 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,
+@@ -52,7 +52,7 @@ where
+ 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
+@@ -98,7 +98,7 @@ impl PathArguments {
+ 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.
+@@ -122,7 +122,7 @@ 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![::]>,
+@@ -135,7 +135,7 @@ ast_struct! {
+ 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,
+@@ -147,7 +147,7 @@ ast_struct! {
+ 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,
+@@ -160,7 +160,7 @@ 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,
+@@ -189,7 +189,7 @@ ast_struct! {
+ /// 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![<],
+@@ -291,11 +291,7 @@ pub mod parsing {
+
+ 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));
+ }
+@@ -358,7 +354,7 @@ 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
+@@ -400,7 +396,6 @@ pub mod parsing {
+ && !input.peek(Token![self])
+ && !input.peek(Token![Self])
+ && !input.peek(Token![crate])
+- && !input.peek(Token![extern])
+ {
+ break;
+ }
+@@ -433,7 +428,7 @@ pub mod parsing {
+ /// 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
+@@ -472,7 +467,7 @@ pub mod parsing {
+ /// - 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()
+diff --git a/third_party/rust/syn/src/punctuated.rs b/third_party/rust/syn/src/punctuated.rs
+index 38c7bf4..46c82a6 100644
+--- a/third_party/rust/syn/src/punctuated.rs
++++ b/third_party/rust/syn/src/punctuated.rs
+@@ -22,6 +22,8 @@
+
+ #[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;
+@@ -41,8 +43,6 @@ use crate::token::Token;
+ /// 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>>,
+@@ -76,22 +76,19 @@ impl<T, P> Punctuated<T, P> {
+ 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`.
+@@ -230,13 +227,19 @@ impl<T, P> Punctuated<T, P> {
+ }
+ }
+
++ /// 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>
+@@ -256,7 +259,7 @@ impl<T, P> Punctuated<T, P> {
+ ///
+ /// [`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(
+@@ -292,7 +295,7 @@ impl<T, P> Punctuated<T, P> {
+ /// 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>
+@@ -312,7 +315,7 @@ impl<T, P> Punctuated<T, P> {
+ ///
+ /// [`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(
+@@ -338,6 +341,53 @@ impl<T, P> Punctuated<T, P> {
+ }
+ }
+
++#[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 {
+@@ -536,7 +586,6 @@ impl<'a, T, P> ExactSizeIterator for PairsMut<'a, 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>,
+@@ -572,12 +621,24 @@ impl<T, P> ExactSizeIterator for IntoPairs<T, P> {
+ }
+ }
+
++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>,
+ }
+@@ -606,6 +667,17 @@ impl<T> ExactSizeIterator for IntoIter<T> {
+ }
+ }
+
++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.
+@@ -799,7 +871,6 @@ impl<'a, T: 'a, I: 'a> IterMutTrait<'a, T> for I where
+ /// 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),
+@@ -856,6 +927,20 @@ impl<T, P> Pair<T, P> {
+ }
+ }
+
++#[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;
+
+diff --git a/third_party/rust/syn/src/reserved.rs b/third_party/rust/syn/src/reserved.rs
+new file mode 100644
+index 0000000..ccfb8b5
+--- /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
+index 71ffe26..01591ced 100644
+--- a/third_party/rust/syn/src/spanned.rs
++++ b/third_party/rust/syn/src/spanned.rs
+@@ -1,7 +1,7 @@
+ //! 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>
+@@ -97,7 +97,7 @@ use quote::spanned::Spanned as ToTokens;
+ ///
+ /// [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
+diff --git a/third_party/rust/syn/src/stmt.rs b/third_party/rust/syn/src/stmt.rs
+index e4277fd..b06e843 100644
+--- a/third_party/rust/syn/src/stmt.rs
++++ b/third_party/rust/syn/src/stmt.rs
+@@ -3,7 +3,7 @@ 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
+@@ -14,7 +14,7 @@ ast_struct! {
+ 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),
+@@ -33,7 +33,7 @@ ast_enum! {
+ 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],
+@@ -47,14 +47,15 @@ ast_struct! {
+ 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
+@@ -106,8 +107,8 @@ pub mod parsing {
+ 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;
+@@ -146,55 +147,55 @@ pub mod parsing {
+ }
+
+ 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)?;
+@@ -213,33 +214,12 @@ pub mod parsing {
+ })))
+ }
+
+- 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()?;
+@@ -265,12 +245,19 @@ pub mod parsing {
+ })
+ }
+
+- 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()?));
+diff --git a/third_party/rust/syn/src/token.rs b/third_party/rust/syn/src/token.rs
+index 0b8c181..8539378 100644
+--- a/third_party/rust/syn/src/token.rs
++++ b/third_party/rust/syn/src/token.rs
+@@ -88,7 +88,6 @@
+ //! [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")]
+@@ -97,13 +96,13 @@ use std::fmt::{self, Debug};
+ 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};
+
+@@ -112,10 +111,8 @@ use self::private::WithSpan;
+ 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")]
+@@ -155,21 +152,20 @@ mod private {
+ #[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 {
+@@ -189,24 +185,38 @@ macro_rules! impl_token {
+ };
+ }
+
+-#[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)]
+@@ -233,7 +243,6 @@ impl<T: CustomToken> Token for T {
+ 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 — use the
+@@ -260,6 +269,16 @@ macro_rules! define_keywords {
+ }
+ }
+
++ #[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 {
+@@ -338,7 +357,6 @@ macro_rules! impl_deref_if_len_is_1 {
+ 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]
+ ///
+@@ -366,6 +384,16 @@ macro_rules! define_punctuation_structs {
+ }
+ }
+
++ #[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 {
+@@ -436,7 +464,6 @@ macro_rules! define_punctuation {
+ 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,
+@@ -458,6 +485,16 @@ macro_rules! define_delimiters {
+ }
+ }
+
++ #[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 {
+@@ -855,7 +892,7 @@ pub mod parsing {
+ }
+
+ 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))
+ }
+diff --git a/third_party/rust/syn/src/tt.rs b/third_party/rust/syn/src/tt.rs
+index f860eeb..8dba062 100644
+--- a/third_party/rust/syn/src/tt.rs
++++ b/third_party/rust/syn/src/tt.rs
+@@ -18,8 +18,8 @@ impl<'a> PartialEq for TokenTreeHelper<'a> {
+ _ => 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() {
+@@ -60,7 +60,7 @@ impl<'a> Hash for TokenTreeHelper<'a> {
+ 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
+diff --git a/third_party/rust/syn/src/ty.rs b/third_party/rust/syn/src/ty.rs
+index 4ee59bd..fd7c97e 100644
+--- a/third_party/rust/syn/src/ty.rs
++++ b/third_party/rust/syn/src/ty.rs
+@@ -1,15 +1,11 @@
+ 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
+@@ -20,7 +16,7 @@ ast_enum_of_structs! {
+ //
+ // 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),
+
+@@ -77,7 +73,7 @@ ast_enum_of_structs! {
+ 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,
+@@ -90,7 +86,7 @@ ast_struct! {
+ 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>,
+@@ -107,7 +103,7 @@ ast_struct! {
+ 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,
+@@ -119,7 +115,7 @@ 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],
+@@ -130,7 +126,7 @@ ast_struct! {
+ 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![_],
+@@ -140,7 +136,7 @@ ast_struct! {
+ 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,
+@@ -150,7 +146,7 @@ ast_struct! {
+ 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![!],
+@@ -160,7 +156,7 @@ ast_struct! {
+ 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,
+@@ -172,7 +168,7 @@ 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>,
+@@ -183,7 +179,7 @@ ast_struct! {
+ 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![*],
+@@ -196,7 +192,7 @@ ast_struct! {
+ 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![&],
+@@ -209,7 +205,7 @@ ast_struct! {
+ 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,
+@@ -221,7 +217,7 @@ 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]>,
+@@ -232,7 +228,7 @@ ast_struct! {
+ 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,
+@@ -240,111 +236,10 @@ ast_struct! {
+ }
+ }
+
+-#[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],
+@@ -355,7 +250,7 @@ ast_struct! {
+ 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>,
+@@ -377,7 +272,7 @@ ast_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.*
+ pub struct Variadic {
+ pub attrs: Vec<Attribute>,
+@@ -388,7 +283,7 @@ ast_struct! {
+ 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.
+@@ -407,10 +302,13 @@ pub mod parsing {
+ 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)
+ }
+ }
+
+@@ -421,15 +319,17 @@ pub mod parsing {
+ ///
+ /// 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]) {
+@@ -524,7 +424,7 @@ pub mod parsing {
+ ..trait_bound
+ })
+ }
+- other => other,
++ other @ TypeParamBound::Lifetime(_) => other,
+ }
+ }
+ _ => break,
+@@ -549,17 +449,20 @@ pub mod parsing {
+ }))
+ } 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![<])
+ {
+@@ -722,38 +625,58 @@ pub mod parsing {
+
+ 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()?);
+- }
+- allow_variadic = inputs.empty_or_trailing();
+- inputs
+- },
+- variadic: {
+- if allow_variadic && args.peek(Token![...]) {
+- Some(Variadic {
+- attrs: Vec::new(),
++ 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;
++ }
++
++ if let Some(arg) = parse_bare_fn_arg(&args, allow_mut_self)? {
++ inputs.push_value(BareFnArg { attrs, ..arg });
+ } else {
+- None
++ has_mut_self = true;
+ }
+- },
+- output: input.call(ReturnType::without_plus)?,
+- })
++ if args.is_empty() {
++ break;
++ }
++
++ inputs.push_punct(args.parse()?);
++ }
++
++ inputs
++ },
++ variadic,
++ output: input.call(ReturnType::without_plus)?,
++ };
++
++ if has_mut_self {
++ Ok(None)
++ } else {
++ Ok(Some(bare_fn))
+ }
+ }
+
+@@ -776,9 +699,27 @@ pub mod parsing {
+ 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
++ },
+ })
+ }
+ }
+@@ -807,9 +748,11 @@ pub mod parsing {
+
+ 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()?;
+@@ -844,10 +787,12 @@ pub mod parsing {
+
+ 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()?,
+@@ -910,7 +855,8 @@ pub mod parsing {
+
+ impl Parse for TypeParen {
+ fn parse(input: ParseStream) -> Result<Self> {
+- Self::parse(input, false)
++ let allow_plus = false;
++ Self::parse(input, allow_plus)
+ }
+ }
+
+@@ -926,22 +872,72 @@ pub mod parsing {
+
+ 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))
+ }
+ }
+
+diff --git a/third_party/rust/syn/src/verbatim.rs b/third_party/rust/syn/src/verbatim.rs
+new file mode 100644
+index 0000000..0686352
+--- /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
+index 0000000..7be082e
+--- /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
+index 0000000..291ed43
+--- /dev/null
++++ b/third_party/rust/syn/tests/.gitignore
+@@ -0,0 +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
+index 8e0863c..0000000
+--- 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
+index 13a6c36..7589a07 100644
+--- a/third_party/rust/syn/tests/common/eq.rs
++++ b/third_party/rust/syn/tests/common/eq.rs
+@@ -1,36 +1,35 @@
++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;
+@@ -86,14 +85,6 @@ impl<A: SpanlessEq, B: SpanlessEq> SpanlessEq for (A, B) {
+ }
+ }
+
+-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 {
+@@ -126,17 +117,19 @@ 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;
+@@ -146,14 +139,14 @@ macro_rules! spanless_eq_struct {
+ };
+
+ {
+- $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)*
+@@ -162,14 +155,14 @@ macro_rules! spanless_eq_struct {
+ };
+
+ {
+- $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]
+@@ -263,119 +256,131 @@ macro_rules! spanless_eq_enum {
+ };
+ }
+
+-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 {
+@@ -414,44 +419,20 @@ impl SpanlessEq for TokenKind {
+
+ impl SpanlessEq for TokenStream {
+ fn eq(&self, other: &Self) -> bool {
+- SpanlessEq::eq(&expand_tts(self), &expand_tts(other))
+- }
+-}
+-
+-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 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;
+ }
+- };
+- 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
+index 8b784be..a1cc80a 100644
+--- a/third_party/rust/syn/tests/common/mod.rs
++++ b/third_party/rust/syn/tests/common/mod.rs
+@@ -1,5 +1,6 @@
+ #![allow(dead_code)]
+
++use rayon::ThreadPoolBuilder;
+ use std::env;
+
+ pub mod eq;
+@@ -12,3 +13,15 @@ pub fn abort_after() -> usize {
+ 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
+index 41d192f..192828f 100644
+--- a/third_party/rust/syn/tests/common/parse.rs
++++ b/third_party/rust/syn/tests/common/parse.rs
+@@ -1,20 +1,20 @@
+-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()),
+@@ -32,7 +32,7 @@ pub fn libsyntax_expr(input: &str) -> Option<P<ast::Expr>> {
+ Ok(Some(e)) => Some(e),
+ Ok(None) => None,
+ Err(_) => {
+- errorf!("libsyntax panicked\n");
++ errorf!("librustc panicked\n");
+ None
+ }
+ }
+diff --git a/third_party/rust/syn/tests/debug/gen.rs b/third_party/rust/syn/tests/debug/gen.rs
+index 8450c09..85a1a39 100644
+--- a/third_party/rust/syn/tests/debug/gen.rs
++++ b/third_party/rust/syn/tests/debug/gen.rs
+@@ -2,7 +2,7 @@
+ // 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;
+@@ -1039,9 +1039,9 @@ impl Debug for Lite<syn::Expr> {
+ }
+ 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) => {
+@@ -2116,9 +2116,9 @@ impl Debug for Lite<syn::ForeignItem> {
+ }
+ 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!(),
+@@ -2432,9 +2432,9 @@ impl Debug for Lite<syn::ImplItem> {
+ }
+ 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!(),
+@@ -2940,9 +2940,9 @@ impl Debug for Lite<syn::Item> {
+ }
+ 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!(),
+@@ -3437,9 +3437,9 @@ impl Debug for Lite<syn::Lit> {
+ }
+ 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(())
+ }
+ }
+@@ -3878,9 +3878,9 @@ impl Debug for Lite<syn::Pat> {
+ }
+ 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) => {
+@@ -4674,9 +4674,9 @@ impl Debug for Lite<syn::TraitItem> {
+ }
+ 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!(),
+@@ -5040,9 +5040,9 @@ impl Debug for Lite<syn::Type> {
+ }
+ 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!(),
+diff --git a/third_party/rust/syn/tests/debug/mod.rs b/third_party/rust/syn/tests/debug/mod.rs
+index c118053..cefebac 100644
+--- a/third_party/rust/syn/tests/debug/mod.rs
++++ b/third_party/rust/syn/tests/debug/mod.rs
+@@ -1,10 +1,7 @@
+-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;
+@@ -66,7 +63,15 @@ impl Debug for Lite<Literal> {
+
+ 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()
++ }
+ }
+ }
+
+diff --git a/third_party/rust/syn/tests/features/error.rs b/third_party/rust/syn/tests/features/error.rs
+deleted file mode 100644
+index 10ac889..0000000
+--- a/third_party/rust/syn/tests/features/error.rs
++++ /dev/null
+@@ -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
+index 83fbe13..0000000
+--- 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
+index c72fd01..3994615 100644
+--- a/third_party/rust/syn/tests/macros/mod.rs
++++ b/third_party/rust/syn/tests/macros/mod.rs
+@@ -1,5 +1,3 @@
+-extern crate proc_macro2;
+-
+ #[path = "../debug/mod.rs"]
+ pub mod debug;
+
+@@ -42,18 +40,18 @@ 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)*) => {
+diff --git a/third_party/rust/syn/tests/repo/mod.rs b/third_party/rust/syn/tests/repo/mod.rs
+index c22cb03..1d3e1f0 100644
+--- a/third_party/rust/syn/tests/repo/mod.rs
++++ b/third_party/rust/syn/tests/repo/mod.rs
+@@ -1,8 +1,37 @@
+-extern crate walkdir;
++mod progress;
+
+-use std::process::Command;
++use self::progress::Progress;
++use anyhow::Result;
++use flate2::read::GzDecoder;
++use std::fs;
++use std::path::Path;
++use tar::Archive;
++use walkdir::DirEntry;
+
+-use self::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",
++
++ // 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",
++
++ // 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();
+@@ -12,49 +41,95 @@ pub fn base_dir_filter(entry: &DirEntry) -> bool {
+ 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
+index 0000000..28c8a44
+--- /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
+index f868fbc..0efef59 100644
+--- a/third_party/rust/syn/tests/test_asyncness.rs
++++ b/third_party/rust/syn/tests/test_asyncness.rs
+@@ -1,7 +1,3 @@
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+
+@@ -12,16 +8,16 @@ 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,
++ }
+ "###);
+ }
+
+@@ -30,12 +26,12 @@ 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
+index aff6294..c26bd09 100644
+--- a/third_party/rust/syn/tests/test_attribute.rs
++++ b/third_party/rust/syn/tests/test_attribute.rs
+@@ -1,7 +1,3 @@
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+
+@@ -13,14 +9,14 @@ 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,
++ },
++ ],
++ })
+ "###);
+ }
+
+@@ -29,17 +25,17 @@ 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,
++ }
+ "###);
+ }
+
+@@ -48,37 +44,37 @@ 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,
++ },
++ }
+ "###);
+ }
+
+@@ -87,19 +83,19 @@ 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),
++ ],
++ }
+ "###);
+ }
+
+@@ -108,26 +104,26 @@ 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,
++ },
++ ],
++ })),
++ ],
++ }
+ "###);
+ }
+
+@@ -136,29 +132,29 @@ 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,
++ }),
++ ],
++ }
+ "###);
+ }
+
+@@ -167,31 +163,31 @@ 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,
++ },
++ }),
++ ],
++ }
+ "###);
+ }
+
+@@ -200,68 +196,68 @@ 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,
++ },
++ ],
++ })),
++ ],
++ }
+ "###);
+ }
+
+@@ -270,21 +266,63 @@ 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,
++ }),
++ ],
++ }
+ "###);
+ }
+
+diff --git a/third_party/rust/syn/tests/test_derive_input.rs b/third_party/rust/syn/tests/test_derive_input.rs
+index de68240..bf1ebdb 100644
+--- a/third_party/rust/syn/tests/test_derive_input.rs
++++ b/third_party/rust/syn/tests/test_derive_input.rs
+@@ -1,8 +1,3 @@
+-extern crate quote;
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+
+@@ -16,15 +11,15 @@ fn test_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,
++ },
++ }
+ "###);
+ }
+
+@@ -39,105 +34,105 @@ fn test_struct() {
+ };
+
+ 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,
++ },
++ ],
++ })),
++ ],
++ }
+ "###);
+ }
+
+@@ -151,46 +146,46 @@ fn test_union() {
+ };
+
+ 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,
++ },
++ ],
++ },
++ },
++ },
++ ],
++ },
++ },
++ }
+ "###);
+ }
+
+@@ -212,118 +207,118 @@ fn test_enum() {
+ };
+
+ 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
+@@ -333,27 +328,27 @@ fn test_enum() {
+ .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,
++ },
++ ],
++ }),
++ ]
+ "###);
+ }
+
+@@ -366,34 +361,34 @@ fn test_attr_with_path() {
+ };
+
+ 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());
+@@ -407,29 +402,29 @@ fn test_attr_with_non_mod_style_path() {
+ };
+
+ 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());
+@@ -443,48 +438,48 @@ fn test_attr_with_mod_style_path_with_self() {
+ };
+
+ 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,
++ },
++ ],
++ })
+ "###);
+ }
+
+@@ -496,55 +491,55 @@ fn test_pub_restricted() {
+ };
+
+ 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,
++ },
++ }
+ "###);
+ }
+
+@@ -555,15 +550,15 @@ fn test_vis_crate() {
+ };
+
+ 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,
++ },
++ }
+ "###);
+ }
+
+@@ -574,24 +569,24 @@ fn test_pub_restricted_crate() {
+ };
+
+ 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,
++ },
++ }
+ "###);
+ }
+
+@@ -602,24 +597,24 @@ fn test_pub_restricted_super() {
+ };
+
+ 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,
++ },
++ }
+ "###);
+ }
+
+@@ -630,25 +625,25 @@ fn test_pub_restricted_in_super() {
+ };
+
+ 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,
++ },
++ }
+ "###);
+ }
+
+@@ -659,15 +654,15 @@ fn test_fields_on_unit_struct() {
+ };
+
+ 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 {
+@@ -688,47 +683,47 @@ fn test_fields_on_named_struct() {
+ };
+
+ 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 {
+@@ -737,38 +732,38 @@ fn test_fields_on_named_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,
++ },
++ ],
++ },
++ },
++ },
++ ]
+ "###);
+ }
+
+@@ -779,44 +774,44 @@ fn test_fields_on_tuple_struct() {
+ };
+
+ 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 {
+@@ -825,34 +820,34 @@ fn test_fields_on_tuple_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,
++ },
++ ],
++ },
++ },
++ },
++ ]
+ "###);
+ }
+
+@@ -864,34 +859,34 @@ fn test_ambiguous_crate() {
+ };
+
+ 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
+index c8a11ce..b2b65a2 100644
+--- 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();
+-
+- snapshot!(expr, @r###"
+- ⋮Expr::Await {
+- ⋮ base: Expr::Path {
+- ⋮ path: Path {
+- ⋮ segments: [
+- ⋮ PathSegment {
+- ⋮ ident: "fut",
+- ⋮ arguments: None,
+- ⋮ },
+- ⋮ ],
+- ⋮ },
+- ⋮ },
+- ⋮}
++ let tokens = quote!(fut.await);
++
++ 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
+index 55c79e0..b29434a 100644
+--- a/third_party/rust/syn/tests/test_generics.rs
++++ b/third_party/rust/syn/tests/test_generics.rs
+@@ -1,8 +1,3 @@
+-extern crate quote;
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+
+@@ -16,90 +11,90 @@ fn test_split_for_impl() {
+ };
+
+ 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;
+@@ -131,46 +126,46 @@ fn test_split_for_impl() {
+ 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,
++ },
++ ],
++ },
++ })
+ "###);
+ }
+
+@@ -187,76 +182,76 @@ fn test_fn_precedence_in_where_clause() {
+ };
+
+ 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();
+@@ -270,7 +265,7 @@ fn test_fn_precedence_in_where_clause() {
+ 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");
+diff --git a/third_party/rust/syn/tests/test_grouping.rs b/third_party/rust/syn/tests/test_grouping.rs
+index 1558a47..a0fe716 100644
+--- a/third_party/rust/syn/tests/test_grouping.rs
++++ b/third_party/rust/syn/tests/test_grouping.rs
+@@ -1,8 +1,3 @@
+-extern crate proc_macro2;
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+
+@@ -28,31 +23,31 @@ fn test_grouping() {
+ 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
+index bec00a7..ee01bfc 100644
+--- a/third_party/rust/syn/tests/test_ident.rs
++++ b/third_party/rust/syn/tests/test_ident.rs
+@@ -1,8 +1,3 @@
+-extern crate proc_macro2;
+-extern crate syn;
+-
+-mod features;
+-
+ use proc_macro2::{Ident, Span, TokenStream};
+ use std::str::FromStr;
+ use syn::Result;
+diff --git a/third_party/rust/syn/tests/test_item.rs b/third_party/rust/syn/tests/test_item.rs
+new file mode 100644
+index 0000000..74ac4ba
+--- /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
+index 1cf7157..2c8359c 100644
+--- a/third_party/rust/syn/tests/test_iterators.rs
++++ b/third_party/rust/syn/tests/test_iterators.rs
+@@ -1,10 +1,5 @@
+ use syn::punctuated::{Pair, Punctuated};
+-
+-extern crate quote;
+-#[macro_use]
+-extern crate syn;
+-
+-mod features;
++use syn::Token;
+
+ #[macro_use]
+ mod macros;
+diff --git a/third_party/rust/syn/tests/test_lit.rs b/third_party/rust/syn/tests/test_lit.rs
+index 1e8f49d..e995f22 100644
+--- a/third_party/rust/syn/tests/test_lit.rs
++++ b/third_party/rust/syn/tests/test_lit.rs
+@@ -1,13 +1,11 @@
+-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)
+@@ -50,6 +48,9 @@ fn strings() {
+ "contains\nnewlinesescaped newlines",
+ );
+ test_string("r\"raw\nstring\\\nhere\"", "raw\nstring\\\nhere");
++ test_string("\"...\"q", "...");
++ test_string("r\"...\"q", "...");
++ test_string("r##\"...\"##q", "...");
+ }
+
+ #[test]
+@@ -79,6 +80,9 @@ fn byte_strings() {
+ 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]
+@@ -100,6 +104,7 @@ fn bytes() {
+ test_byte("b'\\t'", b'\t');
+ test_byte("b'\\''", b'\'');
+ test_byte("b'\"'", b'"');
++ test_byte("b'a'q", b'a');
+ }
+
+ #[test]
+@@ -125,6 +130,7 @@ fn chars() {
+ test_char("'\\''", '\'');
+ test_char("'\"'", '"');
+ test_char("'\\u{1F415}'", '\u{1F415}');
++ test_char("'a'q", 'a');
+ }
+
+ #[test]
+@@ -185,4 +191,59 @@ fn floats() {
+ 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
+index 547472d..d37dda9 100644
+--- a/third_party/rust/syn/tests/test_meta.rs
++++ b/third_party/rust/syn/tests/test_meta.rs
+@@ -1,7 +1,3 @@
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+
+@@ -12,14 +8,14 @@ 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,
++ },
++ ],
++ })
+ "###);
+ }
+
+@@ -29,31 +25,31 @@ fn test_parse_meta_name_value() {
+ 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());
+@@ -65,31 +61,31 @@ fn test_parse_meta_name_value_with_keyword() {
+ 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());
+@@ -101,31 +97,31 @@ fn test_parse_meta_name_value_with_bool() {
+ 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());
+@@ -137,35 +133,35 @@ fn test_parse_meta_item_list_lit() {
+ 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());
+@@ -177,133 +173,133 @@ fn test_parse_meta_item_multiple() {
+ 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());
+@@ -316,28 +312,28 @@ fn test_parse_nested_meta() {
+
+ 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
+index f094951..57a3c7c 100644
+--- a/third_party/rust/syn/tests/test_parse_buffer.rs
++++ b/third_party/rust/syn/tests/test_parse_buffer.rs
+@@ -1,7 +1,7 @@
+-#[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")]
+@@ -53,3 +53,38 @@ fn smuggled_speculative_cursor_into_brackets() {
+
+ 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
+index 0000000..76bd065
+--- /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
+index 1343aa6..73388dd 100644
+--- a/third_party/rust/syn/tests/test_pat.rs
++++ b/third_party/rust/syn/tests/test_pat.rs
+@@ -1,10 +1,5 @@
+-extern crate quote;
+-extern crate syn;
+-
+-mod features;
+-
+ use quote::quote;
+-use syn::Pat;
++use syn::{Item, Pat, Stmt};
+
+ #[test]
+ fn test_pat_ident() {
+@@ -21,3 +16,23 @@ fn test_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
+index 0000000..2ce1206
+--- /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
+index 53ee66e..a586b3f 100644
+--- a/third_party/rust/syn/tests/test_precedence.rs
++++ b/third_party/rust/syn/tests/test_precedence.rs
+@@ -4,35 +4,26 @@
+
+ //! 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;
+@@ -73,7 +64,7 @@ fn test_simple_precedence() {
+ continue;
+ };
+
+- let pf = match test_expressions(vec![expr]) {
++ let pf = match test_expressions(Edition::Edition2018, vec![expr]) {
+ (1, 0) => "passed",
+ (0, 1) => {
+ failed += 1;
+@@ -91,8 +82,8 @@ fn test_simple_precedence() {
+
+ /// 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 {
+@@ -118,15 +109,6 @@ fn test_rustc_precedence() {
+ 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();
+@@ -134,8 +116,9 @@ fn test_rustc_precedence() {
+
+ 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);
+@@ -169,36 +152,36 @@ fn test_rustc_precedence() {
+ }
+ }
+
+-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("e!(#syn_expr).to_string()) {
++ let syn_ast = if let Some(e) = parse::librustc_expr("e!(#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);
+ }
+ }
+ });
+@@ -206,54 +189,106 @@ fn test_expressions(exprs: Vec<syn::Expr>) -> (usize, usize) {
+ (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
+@@ -267,25 +302,8 @@ fn libsyntax_brackets(mut libsyntax_expr: P<ast::Expr>) -> Option<P<ast::Expr>>
+ 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
+@@ -295,11 +313,11 @@ fn libsyntax_brackets(mut libsyntax_expr: P<ast::Expr>) -> Option<P<ast::Expr>>
+ }
+
+ 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)
+ }
+ }
+
+@@ -318,14 +336,33 @@ fn syn_brackets(syn_expr: syn::Expr) -> syn::Expr {
+ 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.
+@@ -360,7 +397,10 @@ fn collect_exprs(file: syn::File) -> Vec<syn::Expr> {
+ 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![],
+diff --git a/third_party/rust/syn/tests/test_receiver.rs b/third_party/rust/syn/tests/test_receiver.rs
+new file mode 100644
+index 0000000..923df96
+--- /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
+index 2fc9cec..260dd0c 100644
+--- a/third_party/rust/syn/tests/test_round_trip.rs
++++ b/third_party/rust/syn/tests/test_round_trip.rs
+@@ -2,22 +2,20 @@
+ #![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;
+@@ -38,8 +36,8 @@ 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 {
+@@ -78,11 +76,12 @@ fn test_round_trip() {
+ }
+ };
+ 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();
+@@ -93,7 +92,7 @@ fn test_round_trip() {
+ 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()
+ );
+@@ -101,10 +100,10 @@ fn test_round_trip() {
+ 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;
+ }
+@@ -130,7 +129,7 @@ fn test_round_trip() {
+ })
+ });
+ 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);
+@@ -147,7 +146,7 @@ fn test_round_trip() {
+ }
+ }
+
+-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
+index 0000000..dc26b9a
+--- /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
+index aadf42e..180d859 100644
+--- a/third_party/rust/syn/tests/test_should_parse.rs
++++ b/third_party/rust/syn/tests/test_should_parse.rs
+@@ -1,7 +1,3 @@
+-extern crate syn;
+-
+-mod features;
+-
+ macro_rules! should_parse {
+ ($name:ident, { $($in:tt)* }) => {
+ #[test]
+diff --git a/third_party/rust/syn/tests/test_size.rs b/third_party/rust/syn/tests/test_size.rs
+index 386d4df..01e8401 100644
+--- a/third_party/rust/syn/tests/test_size.rs
++++ b/third_party/rust/syn/tests/test_size.rs
+@@ -1,7 +1,5 @@
+ #![cfg(target_pointer_width = "64")]
+
+-mod features;
+-
+ use std::mem;
+ use syn::*;
+
+diff --git a/third_party/rust/syn/tests/test_stmt.rs b/third_party/rust/syn/tests/test_stmt.rs
+new file mode 100644
+index 0000000..d68b47f
+--- /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
+index 70a9a72..5b00448 100644
+--- a/third_party/rust/syn/tests/test_token_trees.rs
++++ b/third_party/rust/syn/tests/test_token_trees.rs
+@@ -1,9 +1,3 @@
+-extern crate proc_macro2;
+-extern crate quote;
+-extern crate syn;
+-
+-mod features;
+-
+ #[macro_use]
+ mod macros;
+
+@@ -21,7 +15,11 @@ fn test_struct() {
+ }
+ ";
+
+- 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]
+diff --git a/third_party/rust/syn/tests/test_ty.rs b/third_party/rust/syn/tests/test_ty.rs
+new file mode 100644
+index 0000000..9cbdcd6
+--- /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
+index 0000000..c3d0ac7
+--- /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
+index a81b3df..a1a670d 100644
+--- a/third_party/rust/syn/tests/zzz_stable.rs
++++ b/third_party/rust/syn/tests/zzz_stable.rs
+@@ -1,7 +1,5 @@
+ #![cfg(syn_disable_nightly_tests)]
+
+-extern crate termcolor;
+-
+ use std::io::{self, Write};
+ use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
+
+@@ -10,7 +8,7 @@ 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.
+ ‖
+ ";
projects / firefox-esr.git / commitdiff
