From aba4d473434fbf45f5ffe05202a965a70a2f42d9 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 13 Sep 2024 18:52:04 +0000 Subject: [PATCH] extra/thunderbird to 128.2.0-1 --- extra/thunderbird/.SRCINFO | 394 +- ...79-fix-libc++-18-ignore-tuple-harder.patch | 57 - ...variable-does-not-need-to-be-mutable.patch | 108 - ...atch-from-bugs.freebsd.org-bug278834.patch | 3580 ----------------- ...atch-from-bugs.freebsd.org-bug278989.patch | 199 - extra/thunderbird/PKGBUILD | 144 +- 6 files changed, 262 insertions(+), 4220 deletions(-) delete mode 100644 extra/thunderbird/0031-bmo-1873379-fix-libc++-18-ignore-tuple-harder.patch delete mode 100644 extra/thunderbird/0032-bmo-1841919-llvm-18-variable-does-not-need-to-be-mutable.patch delete mode 100644 extra/thunderbird/0033-bmo-1882209-update-crates-for-rust-1.78-stripped-patch-from-bugs.freebsd.org-bug278834.patch delete mode 100644 extra/thunderbird/0034-bgo-936072-update-crates-for-rust-1.78-patch-from-bugs.freebsd.org-bug278989.patch diff --git a/extra/thunderbird/.SRCINFO b/extra/thunderbird/.SRCINFO index fd30e9025..e26b1c0ed 100644 --- a/extra/thunderbird/.SRCINFO +++ b/extra/thunderbird/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = thunderbird pkgdesc = Standalone mail and news reader from mozilla.org - pkgver = 115.14.0 + pkgver = 128.2.0 pkgrel = 1 url = https://www.thunderbird.net/ arch = x86_64 @@ -83,150 +83,146 @@ pkgbase = thunderbird depends = icu depends = libicui18n.so depends = libicuuc.so - noextract = thunderbird-i18n-115.14.0-af.xpi - noextract = thunderbird-i18n-115.14.0-ar.xpi - noextract = thunderbird-i18n-115.14.0-ast.xpi - noextract = thunderbird-i18n-115.14.0-be.xpi - noextract = thunderbird-i18n-115.14.0-bg.xpi - noextract = thunderbird-i18n-115.14.0-br.xpi - noextract = thunderbird-i18n-115.14.0-ca.xpi - noextract = thunderbird-i18n-115.14.0-cak.xpi - noextract = thunderbird-i18n-115.14.0-cs.xpi - noextract = thunderbird-i18n-115.14.0-cy.xpi - noextract = thunderbird-i18n-115.14.0-da.xpi - noextract = thunderbird-i18n-115.14.0-de.xpi - noextract = thunderbird-i18n-115.14.0-dsb.xpi - noextract = thunderbird-i18n-115.14.0-el.xpi - noextract = thunderbird-i18n-115.14.0-en-GB.xpi - noextract = thunderbird-i18n-115.14.0-en-US.xpi - noextract = thunderbird-i18n-115.14.0-es-AR.xpi - noextract = thunderbird-i18n-115.14.0-es-ES.xpi - noextract = thunderbird-i18n-115.14.0-et.xpi - noextract = thunderbird-i18n-115.14.0-eu.xpi - noextract = thunderbird-i18n-115.14.0-fi.xpi - noextract = thunderbird-i18n-115.14.0-fr.xpi - noextract = thunderbird-i18n-115.14.0-fy-NL.xpi - noextract = thunderbird-i18n-115.14.0-ga-IE.xpi - noextract = thunderbird-i18n-115.14.0-gd.xpi - noextract = thunderbird-i18n-115.14.0-gl.xpi - noextract = thunderbird-i18n-115.14.0-he.xpi - noextract = thunderbird-i18n-115.14.0-hr.xpi - noextract = thunderbird-i18n-115.14.0-hsb.xpi - noextract = thunderbird-i18n-115.14.0-hu.xpi - noextract = thunderbird-i18n-115.14.0-hy-AM.xpi - noextract = thunderbird-i18n-115.14.0-id.xpi - noextract = thunderbird-i18n-115.14.0-is.xpi - noextract = thunderbird-i18n-115.14.0-it.xpi - noextract = thunderbird-i18n-115.14.0-ja.xpi - noextract = thunderbird-i18n-115.14.0-ka.xpi - noextract = thunderbird-i18n-115.14.0-kab.xpi - noextract = thunderbird-i18n-115.14.0-kk.xpi - noextract = thunderbird-i18n-115.14.0-ko.xpi - noextract = thunderbird-i18n-115.14.0-lt.xpi - noextract = thunderbird-i18n-115.14.0-ms.xpi - noextract = thunderbird-i18n-115.14.0-nb-NO.xpi - noextract = thunderbird-i18n-115.14.0-nl.xpi - noextract = thunderbird-i18n-115.14.0-nn-NO.xpi - noextract = thunderbird-i18n-115.14.0-pa-IN.xpi - noextract = thunderbird-i18n-115.14.0-pl.xpi - noextract = thunderbird-i18n-115.14.0-pt-BR.xpi - noextract = thunderbird-i18n-115.14.0-pt-PT.xpi - noextract = thunderbird-i18n-115.14.0-rm.xpi - noextract = thunderbird-i18n-115.14.0-ro.xpi - noextract = thunderbird-i18n-115.14.0-ru.xpi - noextract = thunderbird-i18n-115.14.0-sk.xpi - noextract = thunderbird-i18n-115.14.0-sl.xpi - noextract = thunderbird-i18n-115.14.0-sq.xpi - noextract = thunderbird-i18n-115.14.0-sr.xpi - noextract = thunderbird-i18n-115.14.0-sv-SE.xpi - noextract = thunderbird-i18n-115.14.0-th.xpi - noextract = thunderbird-i18n-115.14.0-tr.xpi - noextract = thunderbird-i18n-115.14.0-uk.xpi - noextract = thunderbird-i18n-115.14.0-uz.xpi - noextract = thunderbird-i18n-115.14.0-vi.xpi - noextract = thunderbird-i18n-115.14.0-zh-CN.xpi - noextract = thunderbird-i18n-115.14.0-zh-TW.xpi + noextract = thunderbird-i18n-128.2.0-af.xpi + noextract = thunderbird-i18n-128.2.0-ar.xpi + noextract = thunderbird-i18n-128.2.0-ast.xpi + noextract = thunderbird-i18n-128.2.0-be.xpi + noextract = thunderbird-i18n-128.2.0-bg.xpi + noextract = thunderbird-i18n-128.2.0-br.xpi + noextract = thunderbird-i18n-128.2.0-ca.xpi + noextract = thunderbird-i18n-128.2.0-cak.xpi + noextract = thunderbird-i18n-128.2.0-cs.xpi + noextract = thunderbird-i18n-128.2.0-cy.xpi + noextract = thunderbird-i18n-128.2.0-da.xpi + noextract = thunderbird-i18n-128.2.0-de.xpi + noextract = thunderbird-i18n-128.2.0-dsb.xpi + noextract = thunderbird-i18n-128.2.0-el.xpi + noextract = thunderbird-i18n-128.2.0-en-GB.xpi + noextract = thunderbird-i18n-128.2.0-en-US.xpi + noextract = thunderbird-i18n-128.2.0-es-AR.xpi + noextract = thunderbird-i18n-128.2.0-es-ES.xpi + noextract = thunderbird-i18n-128.2.0-et.xpi + noextract = thunderbird-i18n-128.2.0-eu.xpi + noextract = thunderbird-i18n-128.2.0-fi.xpi + noextract = thunderbird-i18n-128.2.0-fr.xpi + noextract = thunderbird-i18n-128.2.0-fy-NL.xpi + noextract = thunderbird-i18n-128.2.0-ga-IE.xpi + noextract = thunderbird-i18n-128.2.0-gd.xpi + noextract = thunderbird-i18n-128.2.0-gl.xpi + noextract = thunderbird-i18n-128.2.0-he.xpi + noextract = thunderbird-i18n-128.2.0-hr.xpi + noextract = thunderbird-i18n-128.2.0-hsb.xpi + noextract = thunderbird-i18n-128.2.0-hu.xpi + noextract = thunderbird-i18n-128.2.0-hy-AM.xpi + noextract = thunderbird-i18n-128.2.0-id.xpi + noextract = thunderbird-i18n-128.2.0-is.xpi + noextract = thunderbird-i18n-128.2.0-it.xpi + noextract = thunderbird-i18n-128.2.0-ja.xpi + noextract = thunderbird-i18n-128.2.0-ka.xpi + noextract = thunderbird-i18n-128.2.0-kab.xpi + noextract = thunderbird-i18n-128.2.0-kk.xpi + noextract = thunderbird-i18n-128.2.0-ko.xpi + noextract = thunderbird-i18n-128.2.0-lt.xpi + noextract = thunderbird-i18n-128.2.0-ms.xpi + noextract = thunderbird-i18n-128.2.0-nb-NO.xpi + noextract = thunderbird-i18n-128.2.0-nl.xpi + noextract = thunderbird-i18n-128.2.0-nn-NO.xpi + noextract = thunderbird-i18n-128.2.0-pa-IN.xpi + noextract = thunderbird-i18n-128.2.0-pl.xpi + noextract = thunderbird-i18n-128.2.0-pt-BR.xpi + noextract = thunderbird-i18n-128.2.0-pt-PT.xpi + noextract = thunderbird-i18n-128.2.0-rm.xpi + noextract = thunderbird-i18n-128.2.0-ro.xpi + noextract = thunderbird-i18n-128.2.0-ru.xpi + noextract = thunderbird-i18n-128.2.0-sk.xpi + noextract = thunderbird-i18n-128.2.0-sl.xpi + noextract = thunderbird-i18n-128.2.0-sq.xpi + noextract = thunderbird-i18n-128.2.0-sr.xpi + noextract = thunderbird-i18n-128.2.0-sv-SE.xpi + noextract = thunderbird-i18n-128.2.0-th.xpi + noextract = thunderbird-i18n-128.2.0-tr.xpi + noextract = thunderbird-i18n-128.2.0-uk.xpi + noextract = thunderbird-i18n-128.2.0-uz.xpi + noextract = thunderbird-i18n-128.2.0-vi.xpi + noextract = thunderbird-i18n-128.2.0-zh-CN.xpi + noextract = thunderbird-i18n-128.2.0-zh-TW.xpi options = !emptydirs options = !makeflags options = !lto - source = https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/source/thunderbird-115.14.0.source.tar.xz - source = https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/source/thunderbird-115.14.0.source.tar.xz.asc + source = https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/source/thunderbird-128.2.0esr.source.tar.xz + source = https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/source/thunderbird-128.2.0esr.source.tar.xz.asc source = vendor-prefs.js source = distribution.ini source = mozconfig.cfg source = metainfo.patch source = org.mozilla.Thunderbird.desktop source = thunderbird-system-icu-74.patch - source = 0031-bmo-1873379-fix-libc++-18-ignore-tuple-harder.patch - source = 0032-bmo-1841919-llvm-18-variable-does-not-need-to-be-mutable.patch - source = 0033-bmo-1882209-update-crates-for-rust-1.78-stripped-patch-from-bugs.freebsd.org-bug278834.patch - source = 0034-bgo-936072-update-crates-for-rust-1.78-patch-from-bugs.freebsd.org-bug278989.patch - source = thunderbird-i18n-115.14.0-af.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/af.xpi - source = thunderbird-i18n-115.14.0-ar.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ar.xpi - source = thunderbird-i18n-115.14.0-ast.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ast.xpi - source = thunderbird-i18n-115.14.0-be.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/be.xpi - source = thunderbird-i18n-115.14.0-bg.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/bg.xpi - source = thunderbird-i18n-115.14.0-br.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/br.xpi - source = thunderbird-i18n-115.14.0-ca.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ca.xpi - source = thunderbird-i18n-115.14.0-cak.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/cak.xpi - source = thunderbird-i18n-115.14.0-cs.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/cs.xpi - source = thunderbird-i18n-115.14.0-cy.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/cy.xpi - source = thunderbird-i18n-115.14.0-da.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/da.xpi - source = thunderbird-i18n-115.14.0-de.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/de.xpi - source = thunderbird-i18n-115.14.0-dsb.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/dsb.xpi - source = thunderbird-i18n-115.14.0-el.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/el.xpi - source = thunderbird-i18n-115.14.0-en-GB.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/en-GB.xpi - source = thunderbird-i18n-115.14.0-en-US.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/en-US.xpi - source = thunderbird-i18n-115.14.0-es-AR.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/es-AR.xpi - source = thunderbird-i18n-115.14.0-es-ES.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/es-ES.xpi - source = thunderbird-i18n-115.14.0-et.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/et.xpi - source = thunderbird-i18n-115.14.0-eu.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/eu.xpi - source = thunderbird-i18n-115.14.0-fi.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/fi.xpi - source = thunderbird-i18n-115.14.0-fr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/fr.xpi - source = thunderbird-i18n-115.14.0-fy-NL.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/fy-NL.xpi - source = thunderbird-i18n-115.14.0-ga-IE.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ga-IE.xpi - source = thunderbird-i18n-115.14.0-gd.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/gd.xpi - source = thunderbird-i18n-115.14.0-gl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/gl.xpi - source = thunderbird-i18n-115.14.0-he.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/he.xpi - source = thunderbird-i18n-115.14.0-hr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/hr.xpi - source = thunderbird-i18n-115.14.0-hsb.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/hsb.xpi - source = thunderbird-i18n-115.14.0-hu.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/hu.xpi - source = thunderbird-i18n-115.14.0-hy-AM.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/hy-AM.xpi - source = thunderbird-i18n-115.14.0-id.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/id.xpi - source = thunderbird-i18n-115.14.0-is.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/is.xpi - source = thunderbird-i18n-115.14.0-it.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/it.xpi - source = thunderbird-i18n-115.14.0-ja.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ja.xpi - source = thunderbird-i18n-115.14.0-ka.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ka.xpi - source = thunderbird-i18n-115.14.0-kab.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/kab.xpi - source = thunderbird-i18n-115.14.0-kk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/kk.xpi - source = thunderbird-i18n-115.14.0-ko.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ko.xpi - source = thunderbird-i18n-115.14.0-lt.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/lt.xpi - source = thunderbird-i18n-115.14.0-ms.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ms.xpi - source = thunderbird-i18n-115.14.0-nb-NO.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/nb-NO.xpi - source = thunderbird-i18n-115.14.0-nl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/nl.xpi - source = thunderbird-i18n-115.14.0-nn-NO.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/nn-NO.xpi - source = thunderbird-i18n-115.14.0-pa-IN.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/pa-IN.xpi - source = thunderbird-i18n-115.14.0-pl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/pl.xpi - source = thunderbird-i18n-115.14.0-pt-BR.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/pt-BR.xpi - source = thunderbird-i18n-115.14.0-pt-PT.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/pt-PT.xpi - source = thunderbird-i18n-115.14.0-rm.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/rm.xpi - source = thunderbird-i18n-115.14.0-ro.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ro.xpi - source = thunderbird-i18n-115.14.0-ru.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/ru.xpi - source = thunderbird-i18n-115.14.0-sk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/sk.xpi - source = thunderbird-i18n-115.14.0-sl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/sl.xpi - source = thunderbird-i18n-115.14.0-sq.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/sq.xpi - source = thunderbird-i18n-115.14.0-sr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/sr.xpi - source = thunderbird-i18n-115.14.0-sv-SE.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/sv-SE.xpi - source = thunderbird-i18n-115.14.0-th.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/th.xpi - source = thunderbird-i18n-115.14.0-tr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/tr.xpi - source = thunderbird-i18n-115.14.0-uk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/uk.xpi - source = thunderbird-i18n-115.14.0-uz.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/uz.xpi - source = thunderbird-i18n-115.14.0-vi.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/vi.xpi - source = thunderbird-i18n-115.14.0-zh-CN.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/zh-CN.xpi - source = thunderbird-i18n-115.14.0-zh-TW.xpi::https://archive.mozilla.org/pub/thunderbird/releases/115.14.0/linux-x86_64/xpi/zh-TW.xpi + source = thunderbird-i18n-128.2.0-af.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/af.xpi + source = thunderbird-i18n-128.2.0-ar.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ar.xpi + source = thunderbird-i18n-128.2.0-ast.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ast.xpi + source = thunderbird-i18n-128.2.0-be.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/be.xpi + source = thunderbird-i18n-128.2.0-bg.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/bg.xpi + source = thunderbird-i18n-128.2.0-br.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/br.xpi + source = thunderbird-i18n-128.2.0-ca.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ca.xpi + source = thunderbird-i18n-128.2.0-cak.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/cak.xpi + source = thunderbird-i18n-128.2.0-cs.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/cs.xpi + source = thunderbird-i18n-128.2.0-cy.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/cy.xpi + source = thunderbird-i18n-128.2.0-da.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/da.xpi + source = thunderbird-i18n-128.2.0-de.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/de.xpi + source = thunderbird-i18n-128.2.0-dsb.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/dsb.xpi + source = thunderbird-i18n-128.2.0-el.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/el.xpi + source = thunderbird-i18n-128.2.0-en-GB.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/en-GB.xpi + source = thunderbird-i18n-128.2.0-en-US.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/en-US.xpi + source = thunderbird-i18n-128.2.0-es-AR.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/es-AR.xpi + source = thunderbird-i18n-128.2.0-es-ES.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/es-ES.xpi + source = thunderbird-i18n-128.2.0-et.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/et.xpi + source = thunderbird-i18n-128.2.0-eu.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/eu.xpi + source = thunderbird-i18n-128.2.0-fi.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/fi.xpi + source = thunderbird-i18n-128.2.0-fr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/fr.xpi + source = thunderbird-i18n-128.2.0-fy-NL.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/fy-NL.xpi + source = thunderbird-i18n-128.2.0-ga-IE.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ga-IE.xpi + source = thunderbird-i18n-128.2.0-gd.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/gd.xpi + source = thunderbird-i18n-128.2.0-gl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/gl.xpi + source = thunderbird-i18n-128.2.0-he.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/he.xpi + source = thunderbird-i18n-128.2.0-hr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/hr.xpi + source = thunderbird-i18n-128.2.0-hsb.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/hsb.xpi + source = thunderbird-i18n-128.2.0-hu.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/hu.xpi + source = thunderbird-i18n-128.2.0-hy-AM.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/hy-AM.xpi + source = thunderbird-i18n-128.2.0-id.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/id.xpi + source = thunderbird-i18n-128.2.0-is.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/is.xpi + source = thunderbird-i18n-128.2.0-it.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/it.xpi + source = thunderbird-i18n-128.2.0-ja.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ja.xpi + source = thunderbird-i18n-128.2.0-ka.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ka.xpi + source = thunderbird-i18n-128.2.0-kab.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/kab.xpi + source = thunderbird-i18n-128.2.0-kk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/kk.xpi + source = thunderbird-i18n-128.2.0-ko.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ko.xpi + source = thunderbird-i18n-128.2.0-lt.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/lt.xpi + source = thunderbird-i18n-128.2.0-ms.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ms.xpi + source = thunderbird-i18n-128.2.0-nb-NO.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/nb-NO.xpi + source = thunderbird-i18n-128.2.0-nl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/nl.xpi + source = thunderbird-i18n-128.2.0-nn-NO.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/nn-NO.xpi + source = thunderbird-i18n-128.2.0-pa-IN.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/pa-IN.xpi + source = thunderbird-i18n-128.2.0-pl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/pl.xpi + source = thunderbird-i18n-128.2.0-pt-BR.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/pt-BR.xpi + source = thunderbird-i18n-128.2.0-pt-PT.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/pt-PT.xpi + source = thunderbird-i18n-128.2.0-rm.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/rm.xpi + source = thunderbird-i18n-128.2.0-ro.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ro.xpi + source = thunderbird-i18n-128.2.0-ru.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/ru.xpi + source = thunderbird-i18n-128.2.0-sk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/sk.xpi + source = thunderbird-i18n-128.2.0-sl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/sl.xpi + source = thunderbird-i18n-128.2.0-sq.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/sq.xpi + source = thunderbird-i18n-128.2.0-sr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/sr.xpi + source = thunderbird-i18n-128.2.0-sv-SE.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/sv-SE.xpi + source = thunderbird-i18n-128.2.0-th.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/th.xpi + source = thunderbird-i18n-128.2.0-tr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/tr.xpi + source = thunderbird-i18n-128.2.0-uk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/uk.xpi + source = thunderbird-i18n-128.2.0-uz.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/uz.xpi + source = thunderbird-i18n-128.2.0-vi.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/vi.xpi + source = thunderbird-i18n-128.2.0-zh-CN.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/zh-CN.xpi + source = thunderbird-i18n-128.2.0-zh-TW.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/xpi/zh-TW.xpi validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 validpgpkeys = 4360FE2109C49763186F8E21EBE41E90F6F12F6D - sha512sums = b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29 + sha512sums = 24af7d705c13a0b49b0f9fa66a4d17ce4e95b65cc60f84f56364dc8fb480fb61b80166872e234a3c1cb843624874757407b2d9f0c5af82ddf2bf86de82571077 sha512sums = SKIP sha512sums = 6918c0de63deeddc6f53b9ba331390556c12e0d649cf54587dfaabb98b32d6a597b63cf02809c7c58b15501720455a724d527375a8fb9d757ccca57460320734 sha512sums = 5cd3ac4c94ef6dcce72fba02bc18b771a2f67906ff795e0e3d71ce7db6d8a41165bd5443908470915bdbdb98dddd9cf3f837c4ba3a36413f55ec570e6efdbb9f @@ -234,73 +230,69 @@ pkgbase = thunderbird sha512sums = 7e43b1f25827ddae615ad43fc1e11c6ba439d6c2049477dfe60e00188a70c0a76160c59a97cc01d1fd99c476f261c7cecb57628b5be48874be7cf991c22db290 sha512sums = fffeb73e2055408c5598439b0214b3cb3bb4e53dac3090b880a55f64afcbc56ba5d32d1187829a08ef06d592513d158ced1fde2f20e2f01e967b5fbd3b2fafd4 sha512sums = 9897cb0ababc8e1a0001c4e1f70e0b39f5cdb9c08c69e3afd42088dfd001aa1fc6996cd83df0db1fb57ee0a80686c35c8df783108408dbe9191602cddd1e3c65 - sha512sums = 63de65c2d98287dea2db832a870764f621c25bf0c1353d16f8e68e8316e7554d2047b1c7bbb74a6c48de423f6201964491cd89564e5142066b6609a1aed941a7 - sha512sums = 346fc7c2bcdf0708f41529886a542d2cf11a02799ef2a69dddfa2c6449b8bd7309033f3893f78f21c4ea0be3f35741e12b448977c966f2ae5a0087f9e0465864 - sha512sums = 249706b68ce2450e35216b615b24b7640e75dd120d6d866fa8aab03d644fa6c40b5e129740874d96608bd0c187b6f2456d0d4310729d26d4740d1eca753be4fd - sha512sums = 7bc7969fe03e5cee0ddb844f7917154afdc4a4df8b8af9c8191180a6813faca9f310cf6b689ec358bc45af12fa3ec386cd46cb9feecf9b38557e36552aa0572d - sha512sums = 584013d7b6eea794448f4764c17de7b989155ca782f602948a2d0f745c4344954daacd35327bcb85f9e9cad99d5b917f748d47a4805cef171d806bd8211aa591 - sha512sums = 2767eef517e451aedfca4b9a8e254f4388afc1c6021cdc301bd56513073688a63ceb7891aa5bb9dd6c83ae2d5f9078e9b832bdf3e761c88e2379076d15baf519 - sha512sums = a01c2d85389e7ca86af4bcc73565bca9faea308a77c16457dcb981492433a177761dd20daf3224ee64c7a527408265ae53fdfb2c2a5b4cfa0df8d2325240ca3a - sha512sums = 58f519048e3a5f19e227ace477df49b64ddd622c9ea31e5e819d4efd6bc9667d74414abd1178d356ebb021d11de14cfcda125a1a5ecfc080073c5bded074cef9 - sha512sums = 09b931dc2469bb3df21cc85db53c00407d10c067b957ea63cfb921b89bbd4157f075b72abf8abec923c7c553f8e0c64c42b6d98d96b1c9bb8b27b53688dc99d3 - sha512sums = 992cf5337f6d6b5761ad7332f11b0bba14eb962bff0c5683ca3f01a064ff13d76361adf177953a9091d48277d59f2263aa4aebedd450ca2b158a692a06e08ab6 - sha512sums = ca23e0a7f5df0e167c2cb293e1d5f3e8bf7af55de3233107b73c297c79121c2945da0fe470ea69bc2512de5dd9a967f674cd75945ff603769cc356d3cf3569b7 - sha512sums = 0c15a5a730f9ad8044004b9caa519da63af0312ef34edd818d691f9310c83ee338ead82ced902f340925c21dd29cf47dd19e766bbb9282dc76dc0944f3f707e7 - sha512sums = c5fafb40529893b7a84f044fd69b548ef627ff861f63ba3c14411b860471bbdb308b659e033705afde937e99c28e0d80f7a2e456d305a5621662b872e0dc17bd - sha512sums = 4dc1c483f79e0b0986dbf7b6ef9dfc3e939b7621b0418b9f704d99cbcea18f97dfe3843b4d204f673e62050bbfed2fca84c7545f6baaa6c25d532f21d0c0b0ba - sha512sums = fded4ba16f3275e0063daf590696590dd7bfa2f9e687666df4e351a864808aa890219f7883e8aee53a299ee6231173ec19e834fdb256a45f0871a329f6bbe360 - sha512sums = 63efe71b9ae267b0afdbc8be55e2f66f4b0b86a1eec31df760dcc57ee8e6f11865712bfb5784d4760ec6d75314ac3acae805d105b08c54d0ea619b898da6428a - sha512sums = d6c341b1e7283c756b98e9040dafc4c71743d4d4254b6a6e13664a14b4897058334554975e06905f99d0cb9457fb36234413733eee5059b370ab4652d27e25c4 - sha512sums = ecd1d5896a145b925af0d80255172866e163568822bf306864eabd1c577f002fec022ddacf2cc8212f29287aa56a81448557d4e4c619085db5c41b5a87b2b1d4 - sha512sums = a64e83decc87c5050e9b3557eda80b33cd076d86f9180d6d33e4068e3aa30c7093f0304a92e4e9c7728809ce62faef1a964053784953f249304483f0df9b7ff2 - sha512sums = b8b6130304dcc2e7288d455964ba5a9fe1519e63869482750f71825b5834f9a230e3f314f8b932704607a91f2ce4766005d52a1ca0d686449249faa4b59897a0 - sha512sums = ac84f6a4a4e6a7d026b888da9a23660c048da5993b09059c41542bd699ab8e3fc4dd0d5f3e0b2a49013ce965340b00789bbd8883a4c95e792af7ec1a9b53252e - sha512sums = c7dd7d7f92d5e7146f87925e11e61222acf564466ba5fbf9b56761db7f4f5f5d5e91aa40a860d6095f9e484f5e681188a41227559516fdb97ac39966dab0d491 - sha512sums = b150c1fbb52ad4f2cbbe0ef5a17898324a8c111a6db7bbaa621af478b7dc8ec9a2dcc0abee50c4e38d377964e8f49e2943b9617e81126ce7a3ae73f4dcd794d2 - sha512sums = 89a656d9adcd98025c846db4e744f1c44e8f055afe30ae19af32d515133a00e6986b1718eedf0e58cf2c8e116ebb615bd11c9773eaf0e9cc0ad71da54df7aff9 - sha512sums = 5c2658f35998147d1e059cee9dde2b239be116ee9805621ad01056c13e39c57c8f23f30e02406d071857c34e19df2e3a313be609bf69c616c1d4a935987cf9af - sha512sums = 6e8d1384030b8c45ae6222faef3949b0502d660c2a61bb1951af8dc800fadd663ad588f789836587240947a909d4abe331b059f9b680307e76520237543ae3c0 - sha512sums = 269ace04c16c40d65c44dabe11192756574efd4989f854496d7b0bfabadcfddd14e5fbd051303a63c54eca6622dceaa63df7418bd1b3ee37e06553a7ed1ba942 - sha512sums = 5db9010df40ead2755786f35fef01c710827733523135fa131bb6982aec65fec6d33ccb1ec3bb02ad2e8f6d408a4f690442fb80a4dd3b9630c8efee0cb32335d - sha512sums = 0d3075c4c90bc9c0473f79aea4a83b6e2b58fba18b5d5821c459803020955a3ea44114b96f897410ea51cbc5d9cf5fa006a7c8c34c29ad0caaf0aa0a0316f3f9 - sha512sums = 1386e78162fba0e7476619038a2b729142967faef8c8767d53fe2c94446719e90db49416f2ec56fa6d9053d52a89a9493d15a9298bb1acc29b3bf4a36731632d - sha512sums = 71892ecde40003ebca1974336a08c63965083c98d18012effc1bc8912cca855c7b02c57f86a1f947e01e6d1f1a993d9586f71244625b8fe40b09fb4135569789 - sha512sums = fd7b9f632768f05a4e48c5996542191382d6530cff1fae1785cd6a8e6d48425a029b0cbf6a3b345f8b356fab3605bb00a64a88b6fae58949f2811b22735f534c - sha512sums = 9fe042c385bc89a3b2f75f8f0fc4b95823136e6c0c64e763d783218498caadea36e5c23b2898390ea14ff47743cb61528854f7e7171ac815557ea9cfad15e9b5 - sha512sums = 72e50ba136d89eda9f97990fc9ba193f81cf7a84c00b40116a5fe6c668823a95e38d47a0ab452f00dbb03855eea17882f88d8ff25676fe0ba720c90202316a78 - sha512sums = 5dd005d447f02583a4d42bfee616eee92f74f42490343831842e58b5a1d8559f68605d93b8c30626b07dc83939b0e97d472ed6f6f7bc9ee52f43008edc143b06 - sha512sums = 808832a2d44e9ef4744222357bcf07f019f278eb69a0c77cfd420f924ad23749414e99ed48ec0af89ac5e2df202e522ed68de51e8bf97b492f6f499a3be7c5be - sha512sums = 15d3e85812b78f120b1cb13feadd1a465b5cc91db2888a602bd68b3180d5631018114ecb99c6819df2a6626cf736add59eaf01dde585fede8f55fb173e39db40 - sha512sums = 359fabee10e9e5bb2130d918782c14007a70f2f912a1e683274ddb723cf10ce9fb256e6155ef299fa7bef5d85608a4c56faf91f951d269179c755068cb3d6583 - sha512sums = e5c161f7b3814c7d9a3ccd0f858406e9d625e950fd812482955f74eec291d50cb7a4cf06577fb286d2f4742f5c6d8afe7663024b3f4ffbba0d813e269bdf0e6f - sha512sums = e1f2621207d7e4e2656c568de5953ffe6042d1490dc66fa96438ed2b5cb8cd946ffcd152f903a33f29b567a548f71b3c2426dc5b49d1dd4d227ddb3d18e6a9bd - sha512sums = d0c0b6f17466d935170e873cbf8f28c9b685f7e1c79ba17d19b32cd03d8d727763b472038a8cafbfac7326f2d535b1707baa256c6f4ed86b99c58fcc653b5a80 - sha512sums = a6d0b22d607d4f9688336e9fa983d9d6664208645948c38d7565542d7e7003a0e8208d12bb768d84848721ef26cca6529bdac828d2713ec3c058fbf24bf9afde - sha512sums = cb89874847428199071c9f1fc93cc7dbba2d061c427987ca5b7eb06d404fc149653feb2e2699e7a5fd9c32840a8d6a86470e4bdce103aa54e36bca4c66bc8c89 - sha512sums = 46f86a6b7e0f765cf62e4fcc1f79a55afe005a6b0fe532a1ac58099f550b6e726ff271c9e0833d1dc3880aa5e9cf86c78a759d3d83a2a2d022d1147c948de157 - sha512sums = 6577ee7d014b809a3a1d41edd57ade0fbac8743c545fc7fcbdd7641f8f8773a060d9f03e9e0472d32a2031d15cb8c00a4594992b0006e9e76d2e1f4133f4354f - sha512sums = 7aa9ac637b3b8e087baae7046e437842f871324f883a94fce17f8efc2ce688cbc648687ba77c877c4beecf4dcff3147a849c11b434dae15a313974b53e845b45 - sha512sums = 135f129f2b72d99599ceb5c92f03d96dcef28465717eaaefd1a12a4f8617ede060150cb18caf7ae6ed6053210c32bba0bb5e742b5f99a20f9a1eaf1d86eca37b - sha512sums = 4a54b2254d57c1947fb27728a173270a9f9504c4bca25e2e700c602e6b5b8b9d7538bbd4303c062a55b23cbfc8204975d9699dc82515a80e192295e75898acb5 - sha512sums = 728d23c27bb03fcda6c60f83623ac7e66b4e7788767d657def85e976b5eb578a0b0a03df5baa4688e39db4c9d7fe0c57dd7bb1a4baff44c8c5776071d393125b - sha512sums = 623643cb84760e98a8265b617ac709d03c8e301f34837256b8c4a06e1a918656b1a90052d97b67e2a3ba23e0e499e8fc3285cdd558edb4b3e0ad0429f699cde3 - sha512sums = 7419835e5a02afa24780de1300f606fc2cb4c4872423f5a91ddbdfe6c2731f962adb769869f4e02381d5593bbf3683168eff562b6a2ab781a41a90ac535d6d23 - sha512sums = 18aeb54f46a35e9644bccf6035cfdad6e0448674f38c934857c9184f75ede1e74130e3bab3017b22d286d129680849622cc11a049859a1d14d7df8bf3e62ac8d - sha512sums = 8b72e0772f1c7c4aa00fcd760bc04a3dae69335769d54e9368262fbded96ebf7308a671e46cbb6e921a043d6e297aa77a4510553fd5844f9ad742808b964a476 - sha512sums = f02addfac0f7e11c43b2f43e15d20f5e877c5300be6a5c23ae9d450096f064ebf597319228f81c7d5c6f598805050aff0431025600874e07a8b512e88fd3d083 - sha512sums = f94a708b8c08c416ee1e39207c32fff7c27749bd9025faa576a72493025786495851557251feccfa67fffbfd4a8cfeefaf25fc8a87c295af7be68b1d37d1e272 - sha512sums = f109e8d65417dbd3b0d8f5f37d1c5938d37a09f0387ecd75a690b88d365c56e231ff045010e0d6bfa1ec2c26898fd63a0577d207f837475df558746c46031646 - sha512sums = c9acc7a1ad4cb54868b0a66c0cf2cd6a3460acd6caee3c33331d0cd1894fe9142f1d5c3238c2b481bd80a390dc95d2c8feb513a2457ac86e28910d8ac968a4db - sha512sums = 15bff4ec3b1bf8045a77cb7c5df6b07c8f0a4cf559490db126218b591e691fcc7cb26b3407ef16518d05609728bfa88f129f6df151133fb9e56fcb14d616bc4f - sha512sums = 10166e70d170ca698d4354b2a60d3ce962281e6e41f12e713d18da269562571ce069b8464fc91777ff8c9c2674b1581d58edc36e80b6bc242d455e177f43207e - sha512sums = 0c3c68ff09a02c01fe05d5e03598b551a91f025ba1366cecd443d6c54995a0334a89d746844698e6e1155a5acc1a857e6b5b3068c23f127047a72b29110955f1 - sha512sums = 911034e20151a17e787bc582668bc80323ff72503c0b905e4817a369f05dddf3f0c008e17193f415ae3625339265011f944a9002a1119a89205460a74834c0a4 - sha512sums = e5e656302cff207b53de54d7d090917193286c08ab584755ae3a7942a21beaddd24c02fa449640bf70f3fa2d5a0aeb3e2e8bbecf0d636c1355b4b38d0ab8f826 - sha512sums = ecc0e849166198def15a50aac46855be61acb65fbc63e74eb102293ce62e1320475b6700195feba835846130d597a9301455c4b77ed06a3396b5943be5a1590f - sha512sums = f05bc3ca4e77a72909c14024fb801b67eb928ca0ea6dc7b8cc6a318e08ac6636f1e24d4584ef40d7f34cf012833f627479cef2abf730dbcdcb0b835375e40f60 - sha512sums = 536370b0615b373ee266bf39f434ee5ebec15d535e366fae99a68a2cc7ad75bd44f5abe41af7310b1d5e2e0762e783e4bb88fdd2c9de66f46ccab9c1e87f698e - sha512sums = eb4e1894f408b7d90982a447183c3dbd702c654950c772c3adf6ac90be23655e6d6426210542de70682ba70797c247e6271bc7867fe2a8dc04ba8a63ab0e94c0 - sha512sums = 661acf4f1eeb803eabb4c5b8f9cfbbb6bd71eb456860fe23debf0de889d204aba490d545334098c8fd302de29b6adb5f1a75c4bd96e3fbd13f3dceec358a15ad + sha512sums = 4553dd36a166eded64956870e200fa598111fb970780a2b97f56319a465bb357b81e726f05bbf98cd5c09954e7a19e879b1de3a405bc0445de91ca2b7c44f707 + sha512sums = 688e9fd15d629ab219a9234241bbc731cec59746bab60d1c2201046a58968c0afc2c7ac058501e5f206358b2e76af91ce926974bcbc82b6ca168d09a09ff4563 + sha512sums = edf8813fb11d6a7afd18b3d2253a41d1c4e450028dea2af61233e1602d98c65304038fabc0047c64aec91f65eb943b11b5b30662e4f3a44d21e04c74a4c50f14 + sha512sums = 4a208b9dff9389557f003f4637171b1e58eede69f2c875a5e9fedd488c3b80e84a7fe989d1e67c0b79e18e93df74ef04aa54d613cd1d01c8394a8d8f51531f82 + sha512sums = 99442d6032ee1a2824a0186a22b29748b1b69b7c59a616438ebc6ddce732437ef8b42e9de7b6034bd3f8c763aa725ff699ec6c608199e6cfcb2e79115b745748 + sha512sums = 1d6408eb0688fde1ffa1de6e791380f5e3fc222a5ca1a971a6e9e0a9444de82a3184824f1e95cee71a97a784557d59473e408efee6e33cc07f5f249ad6039475 + sha512sums = 1c99399e388c47516a22d879cc23b14578c28364f0e957d82a7b92e75ee66922f748790a6522e0fa02073a820dcf0c190e9fb2b9a2087ad65499af1f6caae61d + sha512sums = c138049b26928ea03d9554f99a6fa42a641f1bd840e50f16bbf164f15e7a46696651f63fd170ad374ea9931cc61c903606e423a087c1f5fb82fe3b17387c90cd + sha512sums = 2f289d2d43305b091787dbddd62d4c288e031608e4d3a8e73f99fabad1ee694c50d90d4c6c2fd7e14f5d6cbf6ea343cf794b98133744f7d2268c513d4e31aa31 + sha512sums = 6a8264a6ef7e8646dce804a1e8a9c5d789c1fb16c0237b799c0c4752037d7d9e7695bc63f73c56e63388e4b9f05561e14e434f5e3d6538debe05051630da0cc7 + sha512sums = c7342d1d4681106a01ecae25cfb1ee485172c9e7e36d10d0e227e24a1a5d4547f69f2f384c87839fcea1dbdb935f97e504d29e9cb0a39cfc6088282d3149c4ec + sha512sums = df8f8a6d95c2d698427985daf5b6c5922a4201d5314005adf9d66aece66642901a0fc6dd01e4c34ba54ee7c196897f91c7beae69c7c09a2f040ff4f5bb03741d + sha512sums = 08fe7553f916fe0f8057a206cd4f1327e7bb6293ca6254433c08a1113a5f7ba83d26bdc6e16915e61bcff9c31ea4b8ed7d7bceb204f1e9cf8815c930aeeca302 + sha512sums = cd50a58fab6fdb5f2ddb062526547981b44d1193463033d9ee5be7c54f1834adb2a5410da7236678d447442d470f2fb32b389e40fc0961b0d053b8f008ad7914 + sha512sums = 026ba038c4bfb2abd3f26c31ee826eed0d17d00d4ed1e58f25da2e6d6f297ad4e90c1e12d1b8e4e2b908b171ce0cbb4a1057354fc5cee66073c90311c7f54ae6 + sha512sums = 8d2d96feb83ce164a64ed755ffb48d7f036be8e6365b1e1785593cb7bb283efec7f44a6c72413f025fcb2ec2c1a011cb335393fb89207f5f7f30b65e31a0c5a0 + sha512sums = 7552962ef95cfca777c57f4b8109b6ceb0de35387878d140ec4dbcfca556a3d640a0f0049177448d32cce48c17705caa112ceb6409e87c278acbed4f4d3a20f5 + sha512sums = bb5fb42d34b405058c97e7e329a64c9892bdbfe530748167dec283eb34086cd2be772f54e2d56714eda85939fd54faba7f14677c66817d6573faff541d4f561a + sha512sums = e34b4c6c5037401c4d6acb9d64b5984d18ae03c905360f2ae9504dea79afa4e0e9e9d2b93cd1cec843f0eb56945f9fc5070136eff9e4309163ebc4e88de376ac + sha512sums = ebfce61496f2c7c202961be85e4da5aa488b1a91021bf911891cff40c32a3abf0bcc665e6c4d0c07d0778eccd0d61df5fd52163f00ab3b914637f705fcb44a65 + sha512sums = e1ecfdba4e0732a61c61bb931fac430f09642d7641e3cb3da4ec680ca1553a613a49937613a70a520aed158ffdf7f64ca9359c888e11563ab2941101361c29a4 + sha512sums = 163daaaa076f00ee23ab0271249fa7a9c175b6a411f8d3309751e41f02c1f405531b0bb2ae0a29fdad6049ef9c4c8d71bbe479f084e7c98b56bf3be3ab3bda2d + sha512sums = cc336b67d0be16c82b4b3fac0bb5fe16f2c6f6fa711c5c0701970a37d75fc4c7869b329183471decd051566bdbedbacb360e49a283c1c116adf881de717745ce + sha512sums = 09e0f9f0a23c2c52e399d9999873d92893a49c829619861b4f0f72d0dad12b638403626519097e6bd059166752d100c9bda9a4f8a4f47a21478646daf66dc610 + sha512sums = 4b9b3da0cdba5df1a505cd730073d2e8887d4099fdfe7fd5a0f914db2f4e73fab2da47286a84f2eea0bdbbcfd5585f425928b29e7d09f1f050eaf9d3480c036d + sha512sums = 8975e87497557b9b427ff002d2fd156d2ef4e4b0036836af993f1a7b9c73c632c05d424bdc4e6359f6045bbea725ab3dee993e978b020f0480a1acd96395b2ce + sha512sums = 3dd3929b600aab5d1a5c9f489fa326b48eb4de1740579e0d948d8b72aa2fb50e73bf337014be7d892c23cd1b2ab36a13d52da9b10dc4e5a220dff06dcf16afc9 + sha512sums = b02f671ce57339f85098afb41e27b09a516cd903906bd34dfbe199525fecd73cd0bca978464fddef302f38ccab1bc14d862840677e7fbdb1ba9fd20ea754280d + sha512sums = 746dcb7d355c429fd4c6b633885a86eeb37e300a738c5bcbda4ca91ac0f6ededcf915e9d6a5de54bf7b3c2e463cd86d2cdb7ec2342173ed1836ab19f1137a880 + sha512sums = 028839eca290eb7b02c83bb1bb40ec0f35dcae7d446c06f0366ab7cc17c1bdb0adc0bd72a5a71b6b67a4deb607befd2c5de0372c695d3a1ced5407f8c853fae6 + sha512sums = e5add42b6ea194cf5b56c7a90118a4cfabdedfac40d718fb3214c6414f5ed6f0427b3eb9de7c91428f0edcc1364637b04c8ed43ecf5847997d892520ac945822 + sha512sums = 16871831e5b92d8721d52c72afc0af6df0a7048e58e6f59bff8ad09b6aee00c0090c465d00f9501ce0f53d3b10b905bfaa1571d3d3e9006385bd22cd1abc0af8 + sha512sums = 17d1bf8d5ca0aedb25bad3e61f4bfb098830a87d95ace1dd2d90fadc030e7bf668c7cceea170ea7d13d7cb80c6e3e36b6749cdf52b970150dc5ea6b9ae1a6bbe + sha512sums = 8f473a1b0ffd9feec15e415f0c34ba69609e8a8ab271f3b36dacd4866f02affeeb73e4bb975db2375ce051f59969e54fe577591e9f6810e4a5440c659f4c9431 + sha512sums = b09cb2fb7b904d2048f1c37e4dfb74b9adf4b0b21023c55551ae51121acea85198a594701396e0d9058c267b83e8c1f2e6fc5b31f8fca8b001ed23f4cb5883e9 + sha512sums = b02d01ef4f9b75a2d103ad499120cd0f9d01ae2b74d8a922463c2c2d42ddc6dfe73dc7ecf51d7c8f5be235107bb1f8c7b484d747e39bd576165eafab2a0edfbb + sha512sums = 777dd7242a23724a4ce559164c0ee20243fa137e99a7a9c31b1e99587606dcd66fe7d39a89a799ca294b9abdb537da5ede605eaca85b19a35f0cab99b7a11a5f + sha512sums = 8c9a2e6597246a166e0e5a51ec6309035788925e41a115e8e6b489fe1f6e6d528cf4ef535a010d83260a0f0aac375589e4bbdf711fa9b38b15980cb4db43d73e + sha512sums = 1fe409f22f094f9c5b2cc70561650ad4563836ab8a3c5cce846376f53572838a93cca38810e75f2b6d19bc44b156e9341f2ae05b5832ef7844b703ce922b3416 + sha512sums = 42539e633382f62b7fc4adf26a87b0842071077f7e6c6262b78f9174b969dc16ec79640cd7990c0bf6761c14f848792f32c9140248d734d97178566417069691 + sha512sums = d3229b79de9b89f4d668e520f80376ab1a88fc7f160c0d5c105ce4b1ce4fb6293d55368eac7d85a2bee929403386c4ccb143be7656d325ad0ec5e0759885de2c + sha512sums = 580a7d4ccda3fa278647e6c1354cb9e70737ab6ca4fdf1ea2f335808f46369ca8908a77511dc0ca48c99beb45824afd708c9abb8617c8ff842c7547f2cf62f1a + sha512sums = 9934e0042db3801c2fad3a2754d19f640354128dd376fc1db835b253c48cc83639be08de0162533e47db48d7869e689767cacad6ebaf136e22b831af587f6cb0 + sha512sums = 8f225825aef220b637fddab316e49d9a05535b19a83e224d6f7fbc88b56d100e8659e9c51658d2d6d082ce02b5db4ca4a4cfa94c3039a22d68df5c942ad28fc2 + sha512sums = 1301414761d65b83d01b2605a70355b522bf66a2b9a01f7cebae46f8ba1aaf131d98b2989e2e740de2f11cb69067192db2156c286056ddec50bb42475a98641f + sha512sums = 582a2a94f3a472a930561d0a2d297d30d0444673b3d188e6cb3c49999c99a90783dd9671329db625a619ed349b016ab0a1638ace68be065fe2785829d90fff0e + sha512sums = fbda48a6f95cca8f7d02cebda30d2a129b113d4dceda4ea3a4fb1bdec837f61c91e39baf1a3677e0fd16cad49a07a59d8db9ff44d810bddd6af00b7a9981c048 + sha512sums = 3c48f173e48e67a66668af76008da90092fc02c77ec8625fba28218fc693931ff8658adc5913e318900b02ae04131cba1201ba68c7536a1cf8470d38bcc8eeaa + sha512sums = c80e6909801c63c0db8e7423248e74bf634bb6efe14ba8e04ec69f9d1e95a1b8a4f37b44144e3889c3daba6ba2871542093259ffa62dc6e981c05a25bbbe154f + sha512sums = dbc3f1a5b827d249ea7899ea67ceff9055eaeb7fb94c268d26829a056b7e377eea20ac64e685133ffa0418fec3b5114fdac53cb4f21de3006ee0994955f473da + sha512sums = 8fb14d376d25fc7690eb9d7cac23e12935d39809d481bd37038cf5993996e8da9af91369521e736f09e13891dbe2b6ff87538222500feda2166b73798ac5cc0e + sha512sums = 935bc5c8c88c159c1a7179aab69dd1d3ea6507067a9341760ee6e8e3a6fe0a25d8b439d92072b031cf8a675bb47bd7b4d56c26da6a5ab738402247ee4941c497 + sha512sums = fa96809c273f08e93ee833eb64b923eb50c25a216ef69550dbdf7900d801dbe8baa4b87c00f1d08b0f805a7ba638174f03a5bd74db64e8eb7cb5bedab089d2bc + sha512sums = 5a0ff4c52e61dbbbf87a3b012a3031f23a993d9287bda6cb9428e1de36bd0ccf93f0e1e7691fb234e696ac69587d99eff214699c7f0019ae261242b80b0662f7 + sha512sums = c29b762cbcc86b7cf732207a86fb04f548d7e2de8051381a99590e02f49a310fa647af08455172f44f74c095ced5ec301133f82c2d3151534da8903d6c73f6bb + sha512sums = aead8781d882e5afb0a3751ebb37dc06e510b028e03f8653d197c7cb6070f958e023d8a59e3855bfcf87be4cfaa3901e53f76ae7413c84800f4991ca196790f5 + sha512sums = ac7714861e3384d0811eb6becd95d5da87bac4de8df2f78aa103972918259cf3e0947cbfa47eb355463aab3aa4be5abe80e127a61bf880994e192d635440636c + sha512sums = ebd44f3cf3c257fec075c7697246337bfc1fd6f0866947457f975a62e2d57299e77b4e31b72b8340dffb494c1cbd804e773fc0f462d0ec7ee58573ceea027703 + sha512sums = c9c88a315305f76172c7df4dabff7cdb399e2eeb661cfb3b14bf489ca3ec004dc61dd70752436c9b318afa23b3984e697344b1cb1fcaeb7cb0fc92e11fa9de27 + sha512sums = 00959d85d4cf38e203bd27dc1506ea4e4b326fdd3fee6973282180c0c04fcd1a3ff41e196f78c924fb7a666cf644f335523072e19a5a2790d642d1c97839e6e9 + sha512sums = d854fb027d13d24fa4f4783880f76531c2a08bbab5cab5bc041e42ac36954923b797024d99d7c36c032565d5155d6c2d147743cc425ebd8ac2bcfc2179110899 + sha512sums = 647dfe19d2866e1455d9c21ff0576f7a6ee5a780f5d07ca11cc02bade2a50cf42f21270d573f74258feba2a9adbede415fa4ae4a71e87f77a133e8931c259b47 + sha512sums = 162d5a7ef2e84e55424a6fcb14d18999d0b4c781045180a30394d7f767507dc6b1b084b2d4f3bed63b11d605560bf1fd59fbed7ed0d1e0dce6e47511ed7e6a8e pkgname = thunderbird optdepends = hunspell-en_us: Spell checking, American English diff --git a/extra/thunderbird/0031-bmo-1873379-fix-libc++-18-ignore-tuple-harder.patch b/extra/thunderbird/0031-bmo-1873379-fix-libc++-18-ignore-tuple-harder.patch deleted file mode 100644 index 47256e3c5..000000000 --- a/extra/thunderbird/0031-bmo-1873379-fix-libc++-18-ignore-tuple-harder.patch +++ /dev/null @@ -1,57 +0,0 @@ - -# HG changeset patch -# User Emilio Cobos Álvarez -# Date 1705156533 0 -# Node ID 9e96d1447f6c77f15bcd1c7fa432cefae4418038 -# Parent 23a77d3c25d74ed46ebb77f47fda83c7b6dcdb45 -Bug 1873379 - Ignore std::tuple harder. r=firefox-style-system-reviewers,zrhoffman - -In libc++ 18 it seems to be in a nested namespace. Make sure to account -for that. - -Differential Revision: https://phabricator.services.mozilla.com/D198398 - -diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml ---- a/layout/style/ServoBindings.toml -+++ b/layout/style/ServoBindings.toml -@@ -361,16 +361,19 @@ allowlist-types = [ - "NodeSelectorFlags", - ] - opaque-types = [ - "mozilla::StyleThinArc", # https://github.com/rust-lang/rust-bindgen/issues/1557 - "std::pair__PCCP", - "std::namespace::atomic___base", "std::atomic__My_base", - "std::atomic", - "std::atomic___base", -+ "std::tuple.*", # Causes "Cannot find type _Pred in this scope" error on mac, like rust-skia#571 -+ "std::.*::tuple.*", -+ - # We want everything but FontVariation and Float to be opaque but we don't - # have negative regexes. - "mozilla::gfx::(.{0,4}|.{6,12}|.{14,}|([^F][^o][^n][^t][^V][^a][^r][^i][^a][^t][^i][^o][^n])|([^F][^l][^o][^a][^t]))", - "mozilla::dom::Sequence", - "mozilla::SmallPointerArray", - "mozilla::dom::Optional", - "mozilla::dom::OwningNodeOrString_Value", - "mozilla::dom::Nullable", -@@ -386,18 +389,16 @@ opaque-types = [ - "mozilla::detail::PointerType", - "mozilla::HashSet", - "mozilla::Pair", - "mozilla::Pair_Base", - "mozilla::ScrollAxis", # <- For some reason the alignment of this is 4 - # for clang. - "mozilla::SeenPtrs", - "mozilla::SupportsWeakPtr", -- "std::tuple", -- "std::tuple_.*", # Causes "Cannot find type _Pred in this scope" error on mac, like rust-skia#571 - "SupportsWeakPtr", - "mozilla::detail::WeakReference", - "mozilla::WeakPtr", - "nsWritingIterator_reference", "nsReadingIterator_reference", - "nsTObserverArray", # <- Inherits from nsAutoTObserverArray - "mozilla::DoublyLinkedList", - "mozilla::SafeDoublyLinkedList", - "nsTHashtable", # <- Inheriting from inner typedefs that clang - - diff --git a/extra/thunderbird/0032-bmo-1841919-llvm-18-variable-does-not-need-to-be-mutable.patch b/extra/thunderbird/0032-bmo-1841919-llvm-18-variable-does-not-need-to-be-mutable.patch deleted file mode 100644 index b0ee7ae0c..000000000 --- a/extra/thunderbird/0032-bmo-1841919-llvm-18-variable-does-not-need-to-be-mutable.patch +++ /dev/null @@ -1,108 +0,0 @@ - -# HG changeset patch -# User Mike Hommey -# Date 1688610847 0 -# Node ID c4d6ad7c5e4422f2d6de27f92bf53a776371b325 -# Parent ce5753685c87f3fbdaaee65c62d7ff1bd0f11637 -Bug 1841919 - Fix "variable does not need to be mutable" warnings in webrender. r=gfx-reviewers,lsalzman - -Differential Revision: https://phabricator.services.mozilla.com/D182851 - -diff --git a/gfx/wr/webrender/src/compositor/sw_compositor.rs b/gfx/wr/webrender/src/compositor/sw_compositor.rs ---- a/gfx/wr/webrender/src/compositor/sw_compositor.rs -+++ b/gfx/wr/webrender/src/compositor/sw_compositor.rs -@@ -1021,17 +1021,17 @@ impl SwCompositor { - } - } - - /// Lock a surface with an attached external image for compositing. - fn try_lock_composite_surface(&mut self, device: &mut Device, id: &NativeSurfaceId) { - if let Some(surface) = self.surfaces.get_mut(id) { - if let Some(external_image) = surface.external_image { - assert!(!surface.tiles.is_empty()); -- let mut tile = &mut surface.tiles[0]; -+ let tile = &mut surface.tiles[0]; - if let Some(info) = self.composite_surfaces.get(&external_image) { - tile.valid_rect = DeviceIntRect::from_size(info.size); - return; - } - // If the surface has an attached external image, attempt to lock the external image - // for compositing. Yields a descriptor of textures and data necessary for their - // interpretation on success. - let mut info = SWGLCompositeSurfaceInfo { -diff --git a/gfx/wr/webrender/src/picture.rs b/gfx/wr/webrender/src/picture.rs ---- a/gfx/wr/webrender/src/picture.rs -+++ b/gfx/wr/webrender/src/picture.rs -@@ -2883,17 +2883,17 @@ impl TileCacheInstance { - surfaces: &mut [SurfaceInfo], - ) { - // This primitive exists on the last element on the current surface stack. - profile_scope!("update_prim_dependencies"); - let prim_surface_index = surface_stack.last().unwrap().1; - let prim_clip_chain = &prim_instance.vis.clip_chain; - - // Accumulate the exact (clipped) local rect in to the parent surface -- let mut surface = &mut surfaces[prim_surface_index.0]; -+ let surface = &mut surfaces[prim_surface_index.0]; - surface.clipped_local_rect = surface.clipped_local_rect.union(&prim_clip_chain.pic_coverage_rect); - - // If the primitive is directly drawn onto this picture cache surface, then - // the pic_coverage_rect is in the same space. If not, we need to map it from - // the surface space into the picture cache space. - let on_picture_surface = prim_surface_index == self.surface_index; - let pic_coverage_rect = if on_picture_surface { - prim_clip_chain.pic_coverage_rect -diff --git a/gfx/wr/webrender_api/src/display_item_cache.rs b/gfx/wr/webrender_api/src/display_item_cache.rs ---- a/gfx/wr/webrender_api/src/display_item_cache.rs -+++ b/gfx/wr/webrender_api/src/display_item_cache.rs -@@ -53,23 +53,23 @@ struct CacheEntry { - - #[derive(Clone, Deserialize, MallocSizeOf, Serialize)] - pub struct DisplayItemCache { - entries: Vec, - } - - impl DisplayItemCache { - fn add_item(&mut self, key: ItemKey, item: CachedDisplayItem) { -- let mut entry = &mut self.entries[key as usize]; -+ let entry = &mut self.entries[key as usize]; - entry.items.push(item); - entry.occupied = true; - } - - fn clear_entry(&mut self, key: ItemKey) { -- let mut entry = &mut self.entries[key as usize]; -+ let entry = &mut self.entries[key as usize]; - entry.items.clear(); - entry.occupied = false; - } - - fn grow_if_needed(&mut self, capacity: usize) { - if capacity > self.entries.len() { - self.entries.resize_with(capacity, || CacheEntry { - items: Vec::new(), - -diff --git a/gfx/wr/wrench/src/reftest.rs b/gfx/wr/wrench/src/reftest.rs ---- a/gfx/wr/wrench/src/reftest.rs -+++ b/gfx/wr/wrench/src/reftest.rs -@@ -509,17 +509,17 @@ impl ReftestManifest { - // only a single (or no) 'fuzzy' keyword means we use the max - // of that fuzzy and options.allow_.. (we don't want that to - // turn into a test that allows fuzzy.allow_ *plus* options.allow_): - match fuzziness.len() { - 0 => fuzziness.push(RefTestFuzzy { - max_difference: options.allow_max_difference, - num_differences: options.allow_num_differences }), - 1 => { -- let mut fuzzy = &mut fuzziness[0]; -+ let fuzzy = &mut fuzziness[0]; - fuzzy.max_difference = cmp::max(fuzzy.max_difference, options.allow_max_difference); - fuzzy.num_differences = cmp::max(fuzzy.num_differences, options.allow_num_differences); - }, - _ => { - // ignore options, use multiple fuzzy keywords instead. make sure - // the list is sorted to speed up counting violations. - fuzziness.sort_by(|a, b| a.max_difference.cmp(&b.max_difference)); - for pair in fuzziness.windows(2) { - - diff --git a/extra/thunderbird/0033-bmo-1882209-update-crates-for-rust-1.78-stripped-patch-from-bugs.freebsd.org-bug278834.patch b/extra/thunderbird/0033-bmo-1882209-update-crates-for-rust-1.78-stripped-patch-from-bugs.freebsd.org-bug278834.patch deleted file mode 100644 index d4931166b..000000000 --- a/extra/thunderbird/0033-bmo-1882209-update-crates-for-rust-1.78-stripped-patch-from-bugs.freebsd.org-bug278834.patch +++ /dev/null @@ -1,3580 +0,0 @@ - -# HG changeset patch -# User Henri Sivonen -# Date 1714462184 0 -# Node ID 1db2ef126a6a8555dbf50345e16492c977b42e92 -# Parent a545e84b3674c4878f2e618b7bce23058f2ac690 -Bug 1882209 - Update encoding_rs to 0.8.34 to deal with rustc changes. r=glandium,supply-chain-reviewers - -Differential Revision: https://phabricator.services.mozilla.com/D207167 - -diff --git a/.cargo/config.in b/.cargo/config.in ---- a/.cargo/config.in -+++ b/.cargo/config.in -@@ -35,31 +35,31 @@ git = "https://github.com/gfx-rs/wgpu" - rev = "f71a1bc736fde37509262ca03e91d8f56a13aeb5" - replace-with = "vendored-sources" - - [source."git+https://github.com/glandium/warp?rev=4af45fae95bc98b0eba1ef0db17e1dac471bb23d"] - git = "https://github.com/glandium/warp" - rev = "4af45fae95bc98b0eba1ef0db17e1dac471bb23d" - replace-with = "vendored-sources" - -+[source."git+https://github.com/hsivonen/any_all_workaround?rev=7fb1b7034c9f172aade21ee1c8554e8d8a48af80"] -+git = "https://github.com/hsivonen/any_all_workaround" -+rev = "7fb1b7034c9f172aade21ee1c8554e8d8a48af80" -+replace-with = "vendored-sources" -+ - [source."git+https://github.com/hsivonen/chardetng?rev=3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"] - git = "https://github.com/hsivonen/chardetng" - rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" - replace-with = "vendored-sources" - - [source."git+https://github.com/hsivonen/chardetng_c?rev=ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"] - git = "https://github.com/hsivonen/chardetng_c" - rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" - replace-with = "vendored-sources" - --[source."git+https://github.com/hsivonen/packed_simd?rev=e588ceb568878e1a3156ea9ce551d5b63ef0cdc4"] --git = "https://github.com/hsivonen/packed_simd" --rev = "e588ceb568878e1a3156ea9ce551d5b63ef0cdc4" --replace-with = "vendored-sources" -- - [source."git+https://github.com/jfkthame/mapped_hyph.git?rev=c7651a0cffff41996ad13c44f689bd9cd2192c01"] - git = "https://github.com/jfkthame/mapped_hyph.git" - rev = "c7651a0cffff41996ad13c44f689bd9cd2192c01" - replace-with = "vendored-sources" - - [source."git+https://github.com/mozilla-spidermonkey/jsparagus?rev=64ba08e24749616de2344112f226d1ef4ba893ae"] - git = "https://github.com/mozilla-spidermonkey/jsparagus" - rev = "64ba08e24749616de2344112f226d1ef4ba893ae" -diff --git a/Cargo.lock b/Cargo.lock ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -80,16 +80,25 @@ dependencies = [ - name = "android_system_properties" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" - dependencies = [ - "libc", - ] - -+[[package]] -+name = "any_all_workaround" -+version = "0.1.0" -+source = "git+https://github.com/hsivonen/any_all_workaround?rev=7fb1b7034c9f172aade21ee1c8554e8d8a48af80#7fb1b7034c9f172aade21ee1c8554e8d8a48af80" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "version_check", -+] -+ - [[package]] - name = "anyhow" - version = "1.0.69" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" - - [[package]] - name = "app_services_logger" -@@ -1431,22 +1440,22 @@ dependencies = [ - "encoding_rs", - "nserror", - "nsstring", - "xmldecl", - ] - - [[package]] - name = "encoding_rs" --version = "0.8.33" -+version = "0.8.34" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" - dependencies = [ -+ "any_all_workaround", - "cfg-if 1.0.0", -- "packed_simd", - ] - - [[package]] - name = "enum-primitive-derive" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e" - dependencies = [ -@@ -3901,25 +3910,16 @@ checksum = "8d91edf4fbb970279443471345a4e8c491bf05bb283b3e6c88e4e606fd8c181b" - [[package]] - name = "oxilangtag-ffi" - version = "0.1.0" - dependencies = [ - "nsstring", - "oxilangtag", - ] - --[[package]] --name = "packed_simd" --version = "0.3.9" --source = "git+https://github.com/hsivonen/packed_simd?rev=e588ceb568878e1a3156ea9ce551d5b63ef0cdc4#e588ceb568878e1a3156ea9ce551d5b63ef0cdc4" --dependencies = [ -- "cfg-if 1.0.0", -- "num-traits", --] -- - [[package]] - name = "parking_lot" - version = "0.11.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" - dependencies = [ - "instant", - "lock_api", -diff --git a/Cargo.toml b/Cargo.toml ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -154,22 +154,22 @@ rure = { path = "third_party/rust/rure" } - - # 0.31.1 but without rust-cssparser#342. - # TODO: Remove these, and just use v0.31.1 once bug 1836219 lands - # (which will get syn 2 into the tree). - cssparser = { path = "third_party/rust/cssparser" } - cssparser-macros = { path = "third_party/rust/cssparser-macros" } - - # Other overrides -+any_all_workaround = { git = "https://github.com/hsivonen/any_all_workaround", rev = "7fb1b7034c9f172aade21ee1c8554e8d8a48af80" } - chardetng = { git = "https://github.com/hsivonen/chardetng", rev="3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" } - chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } - coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" } - firefox-on-glean = { path = "toolkit/components/glean/api" } - libudev-sys = { path = "dom/webauthn/libudev-sys" } --packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev = "e588ceb568878e1a3156ea9ce551d5b63ef0cdc4" } - midir = { git = "https://github.com/mozilla/midir.git", rev = "519e651241e867af3391db08f9ae6400bc023e18" } - # warp 0.3.3 + https://github.com/seanmonstar/warp/pull/1007 - warp = { git = "https://github.com/glandium/warp", rev = "4af45fae95bc98b0eba1ef0db17e1dac471bb23d" } - - # application-services overrides to make updating them all simpler. - interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "86c84c217036c12283d19368867323a66bf35883" } - sql-support = { git = "https://github.com/mozilla/application-services", rev = "86c84c217036c12283d19368867323a66bf35883" } - sync15 = { git = "https://github.com/mozilla/application-services", rev = "86c84c217036c12283d19368867323a66bf35883" } -diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk ---- a/config/makefiles/rust.mk -+++ b/config/makefiles/rust.mk -@@ -260,17 +260,17 @@ export COREAUDIO_SDK_PATH=$(IPHONEOS_SDK - export IPHONEOS_SDK_DIR - PATH := $(topsrcdir)/build/macosx:$(PATH) - endif - endif - - ifndef RUSTC_BOOTSTRAP - RUSTC_BOOTSTRAP := mozglue_static,qcms - ifdef MOZ_RUST_SIMD --RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd -+RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,any_all_workaround - endif - export RUSTC_BOOTSTRAP - endif - - target_rust_ltoable := force-cargo-library-build $(ADD_RUST_LTOABLE) - target_rust_nonltoable := force-cargo-test-run force-cargo-program-build - - ifdef MOZ_PGO_RUST -diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml ---- a/supply-chain/audits.toml -+++ b/supply-chain/audits.toml -@@ -596,16 +596,29 @@ who = "Mike Hommey "] -+description = "Workaround for bad LLVM codegen for boolean reductions on 32-bit ARM" -+homepage = "https://docs.rs/any_all_workaround/" -+documentation = "https://docs.rs/any_all_workaround/" -+readme = "README.md" -+license = "MIT OR Apache-2.0" -+repository = "https://github.com/hsivonen/any_all_workaround" -+ -+[dependencies] -+cfg-if = "1.0" -+ -+[build-dependencies] -+version_check = "0.9" -diff --git a/third_party/rust/packed_simd/LICENSE-APACHE b/third_party/rust/any_all_workaround/LICENSE-APACHE -rename from third_party/rust/packed_simd/LICENSE-APACHE -rename to third_party/rust/any_all_workaround/LICENSE-APACHE -diff --git a/third_party/rust/packed_simd/LICENSE-MIT b/third_party/rust/any_all_workaround/LICENSE-MIT -rename from third_party/rust/packed_simd/LICENSE-MIT -rename to third_party/rust/any_all_workaround/LICENSE-MIT -diff --git a/third_party/rust/any_all_workaround/LICENSE-MIT-QCMS b/third_party/rust/any_all_workaround/LICENSE-MIT-QCMS -new file mode 100644 ---- /dev/null -+++ b/third_party/rust/any_all_workaround/LICENSE-MIT-QCMS -@@ -0,0 +1,21 @@ -+qcms -+Copyright (C) 2009-2024 Mozilla Corporation -+Copyright (C) 1998-2007 Marti Maria -+ -+Permission is hereby granted, free of charge, to any person obtaining -+a copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the Software -+is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in -+all copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO -+THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -diff --git a/third_party/rust/any_all_workaround/README.md b/third_party/rust/any_all_workaround/README.md -new file mode 100644 ---- /dev/null -+++ b/third_party/rust/any_all_workaround/README.md -@@ -0,0 +1,13 @@ -+# any_all_workaround -+ -+This is a workaround for bad codegen ([Rust bug](https://github.com/rust-lang/portable-simd/issues/146), [LLVM bug](https://github.com/llvm/llvm-project/issues/50466)) for the `any()` and `all()` reductions for NEON-backed SIMD vectors on 32-bit ARM. On other platforms these delegate to `any()` and `all()` in `core::simd`. -+ -+The plan is to abandon this crate once the LLVM bug is fixed or `core::simd` works around the LLVM bug. -+ -+The code is forked from the [`packed_simd` crate](https://raw.githubusercontent.com/hsivonen/packed_simd/d938e39bee9bc5c222f5f2f2a0df9e53b5ce36ae/src/codegen/reductions/mask/arm.rs). -+ -+This crate requires Nightly Rust as it depends on the `portable_simd` feature. -+ -+# License -+ -+`MIT OR Apache-2.0`, since that's how `packed_simd` is licensed. (The ARM intrinsics Rust version workaround is from qcms, see LICENSE-MIT-QCMS.) -diff --git a/third_party/rust/any_all_workaround/build.rs b/third_party/rust/any_all_workaround/build.rs -new file mode 100644 ---- /dev/null -+++ b/third_party/rust/any_all_workaround/build.rs -@@ -0,0 +1,7 @@ -+extern crate version_check as rustc; -+ -+fn main() { -+ if rustc::is_min_version("1.78.0").unwrap_or(false) { -+ println!("cargo:rustc-cfg=stdsimd_split"); -+ } -+} -diff --git a/third_party/rust/any_all_workaround/src/lib.rs b/third_party/rust/any_all_workaround/src/lib.rs -new file mode 100644 ---- /dev/null -+++ b/third_party/rust/any_all_workaround/src/lib.rs -@@ -0,0 +1,110 @@ -+// This code began as a fork of -+// https://raw.githubusercontent.com/rust-lang/packed_simd/d938e39bee9bc5c222f5f2f2a0df9e53b5ce36ae/src/codegen/reductions/mask/arm.rs -+// which didn't have a license header on the file, but Cargo.toml said "MIT OR Apache-2.0". -+// See LICENSE-MIT and LICENSE-APACHE. -+ -+#![no_std] -+#![feature(portable_simd)] -+#![cfg_attr( -+ all( -+ stdsimd_split, -+ target_arch = "arm", -+ target_endian = "little", -+ target_feature = "neon", -+ target_feature = "v7" -+ ), -+ feature(stdarch_arm_neon_intrinsics) -+)] -+#![cfg_attr( -+ all( -+ not(stdsimd_split), -+ target_arch = "arm", -+ target_endian = "little", -+ target_feature = "neon", -+ target_feature = "v7" -+ ), -+ feature(stdsimd) -+)] -+ -+use cfg_if::cfg_if; -+use core::simd::mask16x8; -+use core::simd::mask32x4; -+use core::simd::mask8x16; -+ -+cfg_if! { -+ if #[cfg(all(target_arch = "arm", target_endian = "little", target_feature = "neon", target_feature = "v7"))] { -+ use core::simd::mask8x8; -+ use core::simd::mask16x4; -+ use core::simd::mask32x2; -+ macro_rules! arm_128_v7_neon_impl { -+ ($all:ident, $any:ident, $id:ident, $half:ident, $vpmin:ident, $vpmax:ident) => { -+ #[inline] -+ pub fn $all(s: $id) -> bool { -+ use core::arch::arm::$vpmin; -+ use core::mem::transmute; -+ unsafe { -+ union U { -+ halves: ($half, $half), -+ vec: $id, -+ } -+ let halves = U { vec: s }.halves; -+ let h: $half = transmute($vpmin(transmute(halves.0), transmute(halves.1))); -+ h.all() -+ } -+ } -+ #[inline] -+ pub fn $any(s: $id) -> bool { -+ use core::arch::arm::$vpmax; -+ use core::mem::transmute; -+ unsafe { -+ union U { -+ halves: ($half, $half), -+ vec: $id, -+ } -+ let halves = U { vec: s }.halves; -+ let h: $half = transmute($vpmax(transmute(halves.0), transmute(halves.1))); -+ h.any() -+ } -+ } -+ } -+ } -+ } else { -+ macro_rules! arm_128_v7_neon_impl { -+ ($all:ident, $any:ident, $id:ident, $half:ident, $vpmin:ident, $vpmax:ident) => { -+ #[inline(always)] -+ pub fn $all(s: $id) -> bool { -+ s.all() -+ } -+ #[inline(always)] -+ pub fn $any(s: $id) -> bool { -+ s.any() -+ } -+ } -+ } -+ } -+} -+ -+arm_128_v7_neon_impl!( -+ all_mask8x16, -+ any_mask8x16, -+ mask8x16, -+ mask8x8, -+ vpmin_u8, -+ vpmax_u8 -+); -+arm_128_v7_neon_impl!( -+ all_mask16x8, -+ any_mask16x8, -+ mask16x8, -+ mask16x4, -+ vpmin_u16, -+ vpmax_u16 -+); -+arm_128_v7_neon_impl!( -+ all_mask32x4, -+ any_mask32x4, -+ mask32x4, -+ mask32x2, -+ vpmin_u32, -+ vpmax_u32 -+); -diff --git a/third_party/rust/encoding_rs/Cargo.toml b/third_party/rust/encoding_rs/Cargo.toml ---- a/third_party/rust/encoding_rs/Cargo.toml -+++ b/third_party/rust/encoding_rs/Cargo.toml -@@ -6,18 +6,19 @@ - # to registry (e.g., crates.io) dependencies. - # - # If you are reading this file be aware that the original Cargo.toml - # will likely look very different (and much more reasonable). - # See Cargo.toml.orig for the original contents. - - [package] - edition = "2018" -+rust-version = "1.36" - name = "encoding_rs" --version = "0.8.33" -+version = "0.8.34" - authors = ["Henri Sivonen "] - description = "A Gecko-oriented implementation of the Encoding Standard" - homepage = "https://docs.rs/encoding_rs/" - documentation = "https://docs.rs/encoding_rs/" - readme = "README.md" - keywords = [ - "encoding", - "web", -@@ -31,23 +32,23 @@ categories = [ - "internationalization", - ] - license = "(Apache-2.0 OR MIT) AND BSD-3-Clause" - repository = "https://github.com/hsivonen/encoding_rs" - - [profile.release] - lto = true - -+[dependencies.any_all_workaround] -+version = "0.1.0" -+optional = true -+ - [dependencies.cfg-if] - version = "1.0" - --[dependencies.packed_simd] --version = "0.3.9" --optional = true -- - [dependencies.serde] - version = "1.0" - optional = true - - [dev-dependencies.bincode] - version = "1.0" - - [dev-dependencies.serde_derive] -@@ -69,15 +70,9 @@ fast-legacy-encode = [ - "fast-hanja-encode", - "fast-kanji-encode", - "fast-gb-hanzi-encode", - "fast-big5-hanzi-encode", - ] - less-slow-big5-hanzi-encode = [] - less-slow-gb-hanzi-encode = [] - less-slow-kanji-encode = [] --simd-accel = [ -- "packed_simd", -- "packed_simd/into_bits", --] -- --[badges.travis-ci] --repository = "hsivonen/encoding_rs" -+simd-accel = ["any_all_workaround"] -diff --git a/third_party/rust/encoding_rs/README.md b/third_party/rust/encoding_rs/README.md ---- a/third_party/rust/encoding_rs/README.md -+++ b/third_party/rust/encoding_rs/README.md -@@ -162,50 +162,36 @@ wrappers. - * [C++](https://github.com/hsivonen/recode_cpp) - - ## Optional features - - There are currently these optional cargo features: - - ### `simd-accel` - --Enables SIMD acceleration using the nightly-dependent `packed_simd` crate. -+Enables SIMD acceleration using the nightly-dependent `portable_simd` standard -+library feature. - - This is an opt-in feature, because enabling this feature _opts out_ of Rust's - guarantees of future compilers compiling old code (aka. "stability story"). - - Currently, this has not been tested to be an improvement except for these --targets: -+targets and enabling the `simd-accel` feature is expected to break the build -+on other targets: - - * x86_64 - * i686 - * aarch64 - * thumbv7neon - - If you use nightly Rust, you use targets whose first component is one of the - above, and you are prepared _to have to revise your configuration when updating - Rust_, you should enable this feature. Otherwise, please _do not_ enable this - feature. - --_Note!_ If you are compiling for a target that does not have 128-bit SIMD --enabled as part of the target definition and you are enabling 128-bit SIMD --using `-C target_feature`, you need to enable the `core_arch` Cargo feature --for `packed_simd` to compile a crates.io snapshot of `core_arch` instead of --using the standard-library copy of `core::arch`, because the `core::arch` --module of the pre-compiled standard library has been compiled with the --assumption that the CPU doesn't have 128-bit SIMD. At present this applies --mainly to 32-bit ARM targets whose first component does not include the --substring `neon`. -- --The encoding_rs side of things has not been properly set up for POWER, --PowerPC, MIPS, etc., SIMD at this time, so even if you were to follow --the advice from the previous paragraph, you probably shouldn't use --the `simd-accel` option on the less mainstream architectures at this --time. -- - Used by Firefox. - - ### `serde` - - Enables support for serializing and deserializing `&'static Encoding`-typed - struct fields using [Serde][1]. - - [1]: https://serde.rs/ -@@ -376,18 +362,19 @@ It is a goal to support the latest stabl - the version of Rust that's used for Firefox Nightly. - - At this time, there is no firm commitment to support a version older than - what's required by Firefox, and there is no commitment to treat MSRV changes - as semver-breaking, because this crate depends on `cfg-if`, which doesn't - appear to treat MSRV changes as semver-breaking, so it would be useless for - this crate to treat MSRV changes as semver-breaking. - --As of 2021-02-04, MSRV appears to be Rust 1.36.0 for using the crate and -+As of 2024-04-04, MSRV appears to be Rust 1.36.0 for using the crate and - 1.42.0 for doc tests to pass without errors about the global allocator. -+With the `simd-accel` feature, the MSRV is even higher. - - ## Compatibility with rust-encoding - - A compatibility layer that implements the rust-encoding API on top of - encoding_rs is - [provided as a separate crate](https://github.com/hsivonen/encoding_rs_compat) - (cannot be uploaded to crates.io). The compatibility layer was originally - written with the assuption that Firefox would need it, but it is not currently -@@ -441,20 +428,27 @@ To regenerate the generated code: - - [x] Implement the rust-encoding API in terms of encoding_rs. - - [x] Add SIMD acceleration for Aarch64. - - [x] Investigate the use of NEON on 32-bit ARM. - - [ ] ~Investigate Björn Höhrmann's lookup table acceleration for UTF-8 as - adapted to Rust in rust-encoding.~ - - [x] Add actually fast CJK encode options. - - [ ] ~Investigate [Bob Steagall's lookup table acceleration for UTF-8](https://github.com/BobSteagall/CppNow2018/blob/master/FastConversionFromUTF-8/Fast%20Conversion%20From%20UTF-8%20with%20C%2B%2B%2C%20DFAs%2C%20and%20SSE%20Intrinsics%20-%20Bob%20Steagall%20-%20C%2B%2BNow%202018.pdf).~ - - [x] Provide a build mode that works without `alloc` (with lesser API surface). --- [ ] Migrate to `std::simd` once it is stable and declare 1.0. -+- [x] Migrate to `std::simd` ~once it is stable and declare 1.0.~ -+- [ ] Migrate `unsafe` slice access by larger types than `u8`/`u16` to `align_to`. - - ## Release Notes - -+### 0.8.34 -+ -+* Use the `portable_simd` nightly feature of the standard library instead of the `packed_simd` crate. Only affects the `simd-accel` optional nightly feature. -+* Internal documentation improvements and minor code improvements around `unsafe`. -+* Added `rust-version` to `Cargo.toml`. -+ - ### 0.8.33 - - * Use `packed_simd` instead of `packed_simd_2` again now that updates are back under the `packed_simd` name. Only affects the `simd-accel` optional nightly feature. - - ### 0.8.32 - - * Removed `build.rs`. (This removal should resolve false positives reported by some antivirus products. This may break some build configurations that have opted out of Rust's guarantees against future build breakage.) - * Internal change to what API is used for reinterpreting the lane configuration of SIMD vectors. -diff --git a/third_party/rust/encoding_rs/src/ascii.rs b/third_party/rust/encoding_rs/src/ascii.rs ---- a/third_party/rust/encoding_rs/src/ascii.rs -+++ b/third_party/rust/encoding_rs/src/ascii.rs -@@ -46,71 +46,87 @@ cfg_if! { - #[allow(dead_code)] - #[inline(always)] - fn likely(b: bool) -> bool { - b - } - } - } - -+// Safety invariants for masks: data & mask = 0 for valid ASCII or basic latin utf-16 -+ - // `as` truncates, so works on 32-bit, too. - #[allow(dead_code)] - pub const ASCII_MASK: usize = 0x8080_8080_8080_8080u64 as usize; - - // `as` truncates, so works on 32-bit, too. - #[allow(dead_code)] - pub const BASIC_LATIN_MASK: usize = 0xFF80_FF80_FF80_FF80u64 as usize; - - #[allow(unused_macros)] - macro_rules! ascii_naive { - ($name:ident, $src_unit:ty, $dst_unit:ty) => { -+ /// Safety: src and dst must have len_unit elements and be aligned -+ /// Safety-usable invariant: will return Some() when it fails -+ /// to convert. The first value will be a u8 that is > 127. - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - // Yes, manually omitting the bound check here matters - // a lot for perf. - for i in 0..len { -+ // Safety: len invariant used here - let code_unit = *(src.add(i)); -+ // Safety: Upholds safety-usable invariant here - if code_unit > 127 { - return Some((code_unit, i)); - } -+ // Safety: len invariant used here - *(dst.add(i)) = code_unit as $dst_unit; - } - return None; - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_alu { - ($name:ident, -+ // safety invariant: src/dst MUST be u8 - $src_unit:ty, - $dst_unit:ty, -+ // Safety invariant: stride_fn must consume and produce two usizes, and return the index of the first non-ascii when it fails - $stride_fn:ident) => { -+ /// Safety: src and dst must have len elements, src is valid for read, dst is valid for -+ /// write -+ /// Safety-usable invariant: will return Some() when it fails -+ /// to convert. The first value will be a u8 that is > 127. - #[cfg_attr(feature = "cargo-clippy", allow(never_loop, cast_ptr_alignment))] - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let mut offset = 0usize; - // This loop is only broken out of as a `goto` forward - loop { -+ // Safety: until_alignment becomes the number of bytes we need to munch until we are aligned to usize - let mut until_alignment = { - // Check if the other unit aligns if we move the narrower unit - // to alignment. - // if ::core::mem::size_of::<$src_unit>() == ::core::mem::size_of::<$dst_unit>() { - // ascii_to_ascii - let src_alignment = (src as usize) & ALU_ALIGNMENT_MASK; - let dst_alignment = (dst as usize) & ALU_ALIGNMENT_MASK; - if src_alignment != dst_alignment { -+ // Safety: bails early and ends up in the naïve branch where usize-alignment doesn't matter - break; - } - (ALU_ALIGNMENT - src_alignment) & ALU_ALIGNMENT_MASK - // } else if ::core::mem::size_of::<$src_unit>() < ::core::mem::size_of::<$dst_unit>() { - // ascii_to_basic_latin - // let src_until_alignment = (ALIGNMENT - ((src as usize) & ALIGNMENT_MASK)) & ALIGNMENT_MASK; - // if (dst.add(src_until_alignment) as usize) & ALIGNMENT_MASK != 0 { - // break; -@@ -129,74 +145,104 @@ macro_rules! ascii_alu { - // Moving pointers to alignment seems to be a pessimization on - // x86_64 for operations that have UTF-16 as the internal - // Unicode representation. However, since it seems to be a win - // on ARM (tested ARMv7 code running on ARMv8 [rpi3]), except - // mixed results when encoding from UTF-16 and since x86 and - // x86_64 should be using SSE2 in due course, keeping the move - // to alignment here. It would be good to test on more ARM CPUs - // and on real MIPS and POWER hardware. -+ // -+ // Safety: This is the naïve code once again, for `until_alignment` bytes - while until_alignment != 0 { - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: Upholds safety-usable invariant here - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; -+ // Safety: offset is the number of bytes copied so far - offset += 1; - until_alignment -= 1; - } - let len_minus_stride = len - ALU_STRIDE_SIZE; - loop { -+ // Safety: num_ascii is known to be a byte index of a non-ascii byte due to stride_fn's invariant - if let Some(num_ascii) = $stride_fn( -+ // Safety: These are known to be valid and aligned since we have at -+ // least ALU_STRIDE_SIZE data in these buffers, and offset is the -+ // number of elements copied so far, which according to the -+ // until_alignment calculation above will cause both src and dst to be -+ // aligned to usize after this add - src.add(offset) as *const usize, - dst.add(offset) as *mut usize, - ) { - offset += num_ascii; -+ // Safety: Upholds safety-usable invariant here by indexing into non-ascii byte - return Some((*(src.add(offset)), offset)); - } -+ // Safety: offset continues to be the number of bytes copied so far, and -+ // maintains usize alignment for the next loop iteration - offset += ALU_STRIDE_SIZE; -+ // Safety: This is `offset > len - stride. This loop will continue as long as -+ // `offset <= len - stride`, which means there are `stride` bytes to still be read. - if offset > len_minus_stride { - break; - } - } - } - break; - } -+ -+ // Safety: This is the naïve code, same as ascii_naive, and has no requirements -+ // other than src/dst being valid for the the right lens - while offset < len { -+ // Safety: len invariant used here - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: Upholds safety-usable invariant here - return Some((code_unit, offset)); - } -+ // Safety: len invariant used here - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! basic_latin_alu { - ($name:ident, -+ // safety invariant: use u8 for src/dest for ascii, and u16 for basic_latin - $src_unit:ty, - $dst_unit:ty, -+ // safety invariant: stride function must munch ALU_STRIDE_SIZE*size(src_unit) bytes off of src and -+ // write ALU_STRIDE_SIZE*size(dst_unit) bytes to dst - $stride_fn:ident) => { -+ /// Safety: src and dst must have len elements, src is valid for read, dst is valid for -+ /// write -+ /// Safety-usable invariant: will return Some() when it fails -+ /// to convert. The first value will be a u8 that is > 127. - #[cfg_attr( - feature = "cargo-clippy", - allow(never_loop, cast_ptr_alignment, cast_lossless) - )] - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let mut offset = 0usize; - // This loop is only broken out of as a `goto` forward - loop { -+ // Safety: until_alignment becomes the number of bytes we need to munch from src/dest until we are aligned to usize -+ // We ensure basic-latin has the same alignment as ascii, starting with ascii since it is smaller. - let mut until_alignment = { - // Check if the other unit aligns if we move the narrower unit - // to alignment. - // if ::core::mem::size_of::<$src_unit>() == ::core::mem::size_of::<$dst_unit>() { - // ascii_to_ascii - // let src_alignment = (src as usize) & ALIGNMENT_MASK; - // let dst_alignment = (dst as usize) & ALIGNMENT_MASK; - // if src_alignment != dst_alignment { -@@ -232,66 +278,89 @@ macro_rules! basic_latin_alu { - // Moving pointers to alignment seems to be a pessimization on - // x86_64 for operations that have UTF-16 as the internal - // Unicode representation. However, since it seems to be a win - // on ARM (tested ARMv7 code running on ARMv8 [rpi3]), except - // mixed results when encoding from UTF-16 and since x86 and - // x86_64 should be using SSE2 in due course, keeping the move - // to alignment here. It would be good to test on more ARM CPUs - // and on real MIPS and POWER hardware. -+ // -+ // Safety: This is the naïve code once again, for `until_alignment` bytes - while until_alignment != 0 { - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: Upholds safety-usable invariant here - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; -+ // Safety: offset is the number of bytes copied so far - offset += 1; - until_alignment -= 1; - } - let len_minus_stride = len - ALU_STRIDE_SIZE; - loop { - if !$stride_fn( -+ // Safety: These are known to be valid and aligned since we have at -+ // least ALU_STRIDE_SIZE data in these buffers, and offset is the -+ // number of elements copied so far, which according to the -+ // until_alignment calculation above will cause both src and dst to be -+ // aligned to usize after this add - src.add(offset) as *const usize, - dst.add(offset) as *mut usize, - ) { - break; - } -+ // Safety: offset continues to be the number of bytes copied so far, and -+ // maintains usize alignment for the next loop iteration - offset += ALU_STRIDE_SIZE; -+ // Safety: This is `offset > len - stride. This loop will continue as long as -+ // `offset <= len - stride`, which means there are `stride` bytes to still be read. - if offset > len_minus_stride { - break; - } - } - } - break; - } -+ // Safety: This is the naïve code once again, for leftover bytes - while offset < len { -+ // Safety: len invariant used here - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: Upholds safety-usable invariant here - return Some((code_unit, offset)); - } -+ // Safety: len invariant used here - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! latin1_alu { -+ // safety invariant: stride function must munch ALU_STRIDE_SIZE*size(src_unit) bytes off of src and -+ // write ALU_STRIDE_SIZE*size(dst_unit) bytes to dst - ($name:ident, $src_unit:ty, $dst_unit:ty, $stride_fn:ident) => { -+ /// Safety: src and dst must have len elements, src is valid for read, dst is valid for -+ /// write - #[cfg_attr( - feature = "cargo-clippy", - allow(never_loop, cast_ptr_alignment, cast_lossless) - )] - #[inline(always)] - pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) { - let mut offset = 0usize; - // This loop is only broken out of as a `goto` forward - loop { -+ // Safety: until_alignment becomes the number of bytes we need to munch from src/dest until we are aligned to usize -+ // We ensure the UTF-16 side has the same alignment as the Latin-1 side, starting with Latin-1 since it is smaller. - let mut until_alignment = { - if ::core::mem::size_of::<$src_unit>() < ::core::mem::size_of::<$dst_unit>() { - // unpack - let src_until_alignment = (ALU_ALIGNMENT - - ((src as usize) & ALU_ALIGNMENT_MASK)) - & ALU_ALIGNMENT_MASK; - if (dst.wrapping_add(src_until_alignment) as usize) & ALU_ALIGNMENT_MASK - != 0 -@@ -308,373 +377,485 @@ macro_rules! latin1_alu { - != 0 - { - break; - } - dst_until_alignment - } - }; - if until_alignment + ALU_STRIDE_SIZE <= len { -+ // Safety: This is the naïve code once again, for `until_alignment` bytes - while until_alignment != 0 { - let code_unit = *(src.add(offset)); - *(dst.add(offset)) = code_unit as $dst_unit; -+ // Safety: offset is the number of bytes copied so far - offset += 1; - until_alignment -= 1; - } - let len_minus_stride = len - ALU_STRIDE_SIZE; - loop { - $stride_fn( -+ // Safety: These are known to be valid and aligned since we have at -+ // least ALU_STRIDE_SIZE data in these buffers, and offset is the -+ // number of elements copied so far, which according to the -+ // until_alignment calculation above will cause both src and dst to be -+ // aligned to usize after this add - src.add(offset) as *const usize, - dst.add(offset) as *mut usize, - ); -+ // Safety: offset continues to be the number of bytes copied so far, and -+ // maintains usize alignment for the next loop iteration - offset += ALU_STRIDE_SIZE; -+ // Safety: This is `offset > len - stride. This loop will continue as long as -+ // `offset <= len - stride`, which means there are `stride` bytes to still be read. - if offset > len_minus_stride { - break; - } - } - } - break; - } -+ // Safety: This is the naïve code once again, for leftover bytes - while offset < len { -+ // Safety: len invariant used here - let code_unit = *(src.add(offset)); - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_simd_check_align { - ( - $name:ident, - $src_unit:ty, - $dst_unit:ty, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_src_aligned:ident, -+ // Safety: This function must require unaligned/aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_dst_aligned:ident, -+ // Safety: This function must require unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_neither_aligned:ident - ) => { -+ /// Safety: src/dst must be valid for reads/writes of `len` elements of their units. -+ /// -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `SIMD_STRIDE_SIZE` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - // XXX Should we first process one stride unconditionally as unaligned to - // avoid the cost of the branchiness below if the first stride fails anyway? - // XXX Should we just use unaligned SSE2 access unconditionally? It seems that - // on Haswell, it would make sense to just use unaligned and not bother - // checking. Need to benchmark older architectures before deciding. - let dst_masked = (dst as usize) & SIMD_ALIGNMENT_MASK; -+ // Safety: checking whether src is aligned - if ((src as usize) & SIMD_ALIGNMENT_MASK) == 0 { -+ // Safety: Checking whether dst is aligned - if dst_masked == 0 { - loop { -+ // Safety: We're valid to read/write SIMD_STRIDE_SIZE elements and have the appropriate alignments - if !$stride_both_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } else { - loop { -+ // Safety: We're valid to read/write SIMD_STRIDE_SIZE elements and have the appropriate alignments - if !$stride_src_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - } else { - if dst_masked == 0 { - loop { -+ // Safety: We're valid to read/write SIMD_STRIDE_SIZE elements and have the appropriate alignments - if !$stride_dst_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } else { - loop { -+ // Safety: We're valid to read/write SIMD_STRIDE_SIZE elements and have the appropriate alignments - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - } - } - while offset < len { -+ // Safety: uses len invariant here and below - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: upholds safety-usable invariant - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_simd_check_align_unrolled { - ( - $name:ident, - $src_unit:ty, - $dst_unit:ty, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_src_aligned:ident, -+ // Safety: This function must require unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_neither_aligned:ident, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing 2*SIMD_STRIDE_SIZE src_unit/dst_unit - $double_stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing 2*SIMD_STRIDE_SIZE src_unit/dst_unit - $double_stride_src_aligned:ident - ) => { -- #[inline(always)] -+ /// Safety: src/dst must be valid for reads/writes of `len` elements of their units. -+ /// -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let unit_size = ::core::mem::size_of::<$src_unit>(); - let mut offset = 0usize; - // This loop is only broken out of as a goto forward without - // actually looping - 'outer: loop { -+ // Safety: if this check succeeds we're valid for reading/writing at least `SIMD_STRIDE_SIZE` elements. - if SIMD_STRIDE_SIZE <= len { - // First, process one unaligned -+ // Safety: this is safe to call since we're valid for this read/write - if !$stride_neither_aligned(src, dst) { - break 'outer; - } - offset = SIMD_STRIDE_SIZE; - - // We have now seen 16 ASCII bytes. Let's guess that - // there will be enough more to justify more expense - // in the case of non-ASCII. - // Use aligned reads for the sake of old microachitectures. -+ // -+ // Safety: this correctly calculates the number of src_units that need to be read before the remaining list is aligned. -+ // This is less that SIMD_ALIGNMENT, which is also SIMD_STRIDE_SIZE (as documented) - let until_alignment = ((SIMD_ALIGNMENT - - ((src.add(offset) as usize) & SIMD_ALIGNMENT_MASK)) - & SIMD_ALIGNMENT_MASK) - / unit_size; -- // This addition won't overflow, because even in the 32-bit PAE case the -+ // Safety: This addition won't overflow, because even in the 32-bit PAE case the - // address space holds enough code that the slice length can't be that - // close to address space size. - // offset now equals SIMD_STRIDE_SIZE, hence times 3 below. -+ // -+ // Safety: if this check succeeds we're valid for reading/writing at least `2 * SIMD_STRIDE_SIZE` elements plus `until_alignment`. -+ // The extra SIMD_STRIDE_SIZE in the condition is because `offset` is already `SIMD_STRIDE_SIZE`. - if until_alignment + (SIMD_STRIDE_SIZE * 3) <= len { - if until_alignment != 0 { -+ // Safety: this is safe to call since we're valid for this read/write (and more), and don't care about alignment -+ // This will copy over bytes that get decoded twice since it's not incrementing `offset` by SIMD_STRIDE_SIZE. This is fine. - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += until_alignment; - } -+ // Safety: At this point we're valid for reading/writing 2*SIMD_STRIDE_SIZE elements -+ // Safety: Now `offset` is aligned for `src` - let len_minus_stride_times_two = len - (SIMD_STRIDE_SIZE * 2); -+ // Safety: This is whether dst is aligned - let dst_masked = (dst.add(offset) as usize) & SIMD_ALIGNMENT_MASK; - if dst_masked == 0 { - loop { -+ // Safety: both are aligned, we can call the aligned function. We're valid for reading/writing double stride from the initial condition -+ // and the loop break condition below - if let Some(advance) = - $double_stride_both_aligned(src.add(offset), dst.add(offset)) - { - offset += advance; - let code_unit = *(src.add(offset)); -+ // Safety: uses safety-usable invariant on ascii_to_ascii_simd_double_stride to return -+ // guaranteed non-ascii - return Some((code_unit, offset)); - } - offset += SIMD_STRIDE_SIZE * 2; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride_times_two { - break; - } - } -+ // Safety: We're valid for reading/writing one more, and can still assume alignment - if offset + SIMD_STRIDE_SIZE <= len { - if !$stride_both_aligned(src.add(offset), dst.add(offset)) { - break 'outer; - } - offset += SIMD_STRIDE_SIZE; - } - } else { - loop { -+ // Safety: only src is aligned here. We're valid for reading/writing double stride from the initial condition -+ // and the loop break condition below - if let Some(advance) = - $double_stride_src_aligned(src.add(offset), dst.add(offset)) - { - offset += advance; - let code_unit = *(src.add(offset)); -+ // Safety: uses safety-usable invariant on ascii_to_ascii_simd_double_stride to return -+ // guaranteed non-ascii - return Some((code_unit, offset)); - } - offset += SIMD_STRIDE_SIZE * 2; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. -+ - if offset > len_minus_stride_times_two { - break; - } - } -+ // Safety: We're valid for reading/writing one more, and can still assume alignment - if offset + SIMD_STRIDE_SIZE <= len { - if !$stride_src_aligned(src.add(offset), dst.add(offset)) { - break 'outer; - } - offset += SIMD_STRIDE_SIZE; - } - } - } else { - // At most two iterations, so unroll - if offset + SIMD_STRIDE_SIZE <= len { -+ // Safety: The check above ensures we're allowed to read/write this, and we don't use alignment - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; - if offset + SIMD_STRIDE_SIZE <= len { -+ // Safety: The check above ensures we're allowed to read/write this, and we don't use alignment - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; - } - } - } - } - break 'outer; - } - while offset < len { -+ // Safety: relies straightforwardly on the `len` invariant - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety-usable invariant upheld here - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! latin1_simd_check_align { - ( - $name:ident, - $src_unit:ty, - $dst_unit:ty, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_src_aligned:ident, -+ // Safety: This function must require unaligned/aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_dst_aligned:ident, -+ // Safety: This function must require unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_neither_aligned:ident -+ - ) => { -+ /// Safety: src/dst must be valid for reads/writes of `len` elements of their units. - #[inline(always)] - pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) { - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `SIMD_STRIDE_SIZE` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; -+ // Whether dst is aligned - let dst_masked = (dst as usize) & SIMD_ALIGNMENT_MASK; -+ // Whether src is aligned - if ((src as usize) & SIMD_ALIGNMENT_MASK) == 0 { - if dst_masked == 0 { - loop { -+ // Safety: Both were aligned, we can use the aligned function - $stride_both_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which means in the next iteration we're valid for -+ // reading/writing at least SIMD_STRIDE_SIZE elements. - if offset > len_minus_stride { - break; - } - } - } else { - loop { -+ // Safety: src was aligned, dst was not - $stride_src_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which means in the next iteration we're valid for -+ // reading/writing at least SIMD_STRIDE_SIZE elements. - if offset > len_minus_stride { - break; - } - } - } - } else { - if dst_masked == 0 { - loop { -+ // Safety: src was aligned, dst was not - $stride_dst_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which means in the next iteration we're valid for -+ // reading/writing at least SIMD_STRIDE_SIZE elements. - if offset > len_minus_stride { - break; - } - } - } else { - loop { -+ // Safety: Neither were aligned - $stride_neither_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which means in the next iteration we're valid for -+ // reading/writing at least SIMD_STRIDE_SIZE elements. - if offset > len_minus_stride { - break; - } - } - } - } - } - while offset < len { -+ // Safety: relies straightforwardly on the `len` invariant - let code_unit = *(src.add(offset)); - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! latin1_simd_check_align_unrolled { - ( - $name:ident, - $src_unit:ty, - $dst_unit:ty, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_src_aligned:ident, -+ // Safety: This function must require unaligned/aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_dst_aligned:ident, -+ // Safety: This function must require unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_neither_aligned:ident - ) => { -+ /// Safety: src/dst must be valid for reads/writes of `len` elements of their units. - #[inline(always)] - pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) { - let unit_size = ::core::mem::size_of::<$src_unit>(); - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `SIMD_STRIDE_SIZE` elements. - if SIMD_STRIDE_SIZE <= len { -+ // Safety: this correctly calculates the number of src_units that need to be read before the remaining list is aligned. -+ // This is by definition less than SIMD_STRIDE_SIZE. - let mut until_alignment = ((SIMD_STRIDE_SIZE - - ((src as usize) & SIMD_ALIGNMENT_MASK)) - & SIMD_ALIGNMENT_MASK) - / unit_size; - while until_alignment != 0 { -+ // Safety: This is a straightforward copy, since until_alignment is < SIMD_STRIDE_SIZE < len, this is in-bounds - *(dst.add(offset)) = *(src.add(offset)) as $dst_unit; - offset += 1; - until_alignment -= 1; - } -+ // Safety: here offset will be `until_alignment`, i.e. enough to align `src`. - let len_minus_stride = len - SIMD_STRIDE_SIZE; -+ // Safety: if this check succeeds we're valid for reading/writing at least `2 * SIMD_STRIDE_SIZE` elements. - if offset + SIMD_STRIDE_SIZE * 2 <= len { - let len_minus_stride_times_two = len_minus_stride - SIMD_STRIDE_SIZE; -+ // Safety: at this point src is known to be aligned at offset, dst is not. - if (dst.add(offset) as usize) & SIMD_ALIGNMENT_MASK == 0 { - loop { -+ // Safety: We checked alignment of dst above, we can use the alignment functions. We're allowed to read/write 2*SIMD_STRIDE_SIZE elements, which we do. - $stride_both_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; - $stride_both_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride_times_two { - break; - } - } - } else { - loop { -+ // Safety: we ensured alignment of src already. - $stride_src_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; - $stride_src_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride_times_two { - break; - } - } - } - } -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we are valid to munch SIMD_STRIDE_SIZE more elements, which we do - if offset < len_minus_stride { - $stride_src_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; - } - } - while offset < len { -+ // Safety: uses len invariant here and below - let code_unit = *(src.add(offset)); - // On x86_64, this loop autovectorizes but in the pack - // case there are instructions whose purpose is to make sure - // each u16 in the vector is truncated before packing. However, - // since we don't care about saturating behavior of SSE2 packing - // when the input isn't Latin1, those instructions are useless. - // Unfortunately, using the `assume` intrinsic to lie to the - // optimizer doesn't make LLVM omit the trunctation that we -@@ -688,138 +869,180 @@ macro_rules! latin1_simd_check_align_unr - offset += 1; - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_simd_unalign { -+ // Safety: stride_neither_aligned must be a function that requires src/dest be valid for unaligned reads/writes for SIMD_STRIDE_SIZE elements of type src_unit/dest_unit - ($name:ident, $src_unit:ty, $dst_unit:ty, $stride_neither_aligned:ident) => { -+ /// Safety: src and dst must be valid for reads/writes of len elements of type src_unit/dst_unit -+ /// -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `stride` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - loop { -+ // Safety: We know we're valid for `stride` reads/writes, so we can call this function. We don't need alignment. - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // This is `offset > len - stride` which means we always have at least `stride` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - while offset < len { -+ // Safety: Uses len invariant here and below - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety-usable invariant upheld here - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! latin1_simd_unalign { -+ // Safety: stride_neither_aligned must be a function that requires src/dest be valid for unaligned reads/writes for SIMD_STRIDE_SIZE elements of type src_unit/dest_unit - ($name:ident, $src_unit:ty, $dst_unit:ty, $stride_neither_aligned:ident) => { -+ /// Safety: src and dst must be valid for unaligned reads/writes of len elements of type src_unit/dst_unit - #[inline(always)] - pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) { - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `stride` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - loop { -+ // Safety: We know we're valid for `stride` reads/writes, so we can call this function. We don't need alignment. - $stride_neither_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // This is `offset > len - stride` which means we always have at least `stride` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - while offset < len { -+ // Safety: Uses len invariant here - let code_unit = *(src.add(offset)); - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_to_ascii_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 16 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u8) -> bool { - let simd = $load(src); - if !simd_is_ascii(simd) { - return false; - } - $store(dst, simd); - true - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_to_ascii_simd_double_stride { -+ // Safety: store must be valid for 32 bytes of write, which may be unaligned (candidates: `store(8|16)_(aligned|unaligned)`) - ($name:ident, $store:ident) => { -+ /// Safety: src must be valid for 32 bytes of aligned u8x16 read -+ /// dst must be valid for 32 bytes of unaligned write according to -+ /// the $store fn, which may allow for unaligned writes or require -+ /// alignment to either 16x8 or u8x16. -+ /// -+ /// Safety-usable invariant: Returns Some(index) if the element at `index` is invalid ASCII - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u8) -> Option { - let first = load16_aligned(src); - let second = load16_aligned(src.add(SIMD_STRIDE_SIZE)); - $store(dst, first); - if unlikely(!simd_is_ascii(first | second)) { -+ // Safety: mask_ascii produces a mask of all the high bits. - let mask_first = mask_ascii(first); - if mask_first != 0 { -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src -+ // TODO SAFETY: What about big-endian systems? - return Some(mask_first.trailing_zeros() as usize); - } - $store(dst.add(SIMD_STRIDE_SIZE), second); - let mask_second = mask_ascii(second); -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src - return Some(SIMD_STRIDE_SIZE + mask_second.trailing_zeros() as usize); - } - $store(dst.add(SIMD_STRIDE_SIZE), second); - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_to_basic_latin_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 16/32 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u16) -> bool { - let simd = $load(src); - if !simd_is_ascii(simd) { - return false; - } - let (first, second) = simd_unpack(simd); - $store(dst, first); - $store(dst.add(8), second); - true - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_to_basic_latin_simd_double_stride { -+ // Safety: store must be valid for 16 bytes of write, which may be unaligned - ($name:ident, $store:ident) => { -+ /// Safety: src must be valid for 2*SIMD_STRIDE_SIZE bytes of aligned reads, -+ /// aligned to either 16x8 or u8x16. -+ /// dst must be valid for 2*SIMD_STRIDE_SIZE bytes of aligned or unaligned reads - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u16) -> Option { - let first = load16_aligned(src); - let second = load16_aligned(src.add(SIMD_STRIDE_SIZE)); - let (a, b) = simd_unpack(first); - $store(dst, a); -+ // Safety: divide by 2 since it's a u16 pointer - $store(dst.add(SIMD_STRIDE_SIZE / 2), b); - if unlikely(!simd_is_ascii(first | second)) { - let mask_first = mask_ascii(first); - if mask_first != 0 { - return Some(mask_first.trailing_zeros() as usize); - } - let (c, d) = simd_unpack(second); - $store(dst.add(SIMD_STRIDE_SIZE), c); -@@ -832,47 +1055,59 @@ macro_rules! ascii_to_basic_latin_simd_d - $store(dst.add(SIMD_STRIDE_SIZE + (SIMD_STRIDE_SIZE / 2)), d); - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! unpack_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 16 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u16) { - let simd = $load(src); - let (first, second) = simd_unpack(simd); - $store(dst, first); - $store(dst.add(8), second); - } - }; - } - - #[allow(unused_macros)] - macro_rules! basic_latin_to_ascii_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 32/16 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u16, dst: *mut u8) -> bool { - let first = $load(src); - let second = $load(src.add(8)); - if simd_is_basic_latin(first | second) { - $store(dst, simd_pack(first, second)); - true - } else { - false - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! pack_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 32/16 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u16, dst: *mut u8) { - let first = $load(src); - let second = $load(src.add(8)); - $store(dst, simd_pack(first, second)); - } - }; - } -@@ -888,24 +1123,28 @@ cfg_if! { - // pub const ALIGNMENT: usize = 8; - - pub const ALU_STRIDE_SIZE: usize = 16; - - pub const ALU_ALIGNMENT: usize = 8; - - pub const ALU_ALIGNMENT_MASK: usize = 7; - -+ // Safety for stride macros: We stick to the load8_aligned/etc family of functions. We consistently produce -+ // neither_unaligned variants using only unaligned inputs. - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_neither_aligned, load16_unaligned, store16_unaligned); - - ascii_to_basic_latin_simd_stride!(ascii_to_basic_latin_stride_neither_aligned, load16_unaligned, store8_unaligned); - unpack_simd_stride!(unpack_stride_neither_aligned, load16_unaligned, store8_unaligned); - - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_neither_aligned, load8_unaligned, store16_unaligned); - pack_simd_stride!(pack_stride_neither_aligned, load8_unaligned, store16_unaligned); - -+ // Safety for conversion macros: We use the unalign macro with unalign functions above. All stride functions were produced -+ // by stride macros that universally munch a single SIMD_STRIDE_SIZE worth of elements. - ascii_simd_unalign!(ascii_to_ascii, u8, u8, ascii_to_ascii_stride_neither_aligned); - ascii_simd_unalign!(ascii_to_basic_latin, u8, u16, ascii_to_basic_latin_stride_neither_aligned); - ascii_simd_unalign!(basic_latin_to_ascii, u16, u8, basic_latin_to_ascii_stride_neither_aligned); - latin1_simd_unalign!(unpack_latin1, u8, u16, unpack_stride_neither_aligned); - latin1_simd_unalign!(pack_latin1, u16, u8, pack_stride_neither_aligned); - } else if #[cfg(all(feature = "simd-accel", target_endian = "little", target_feature = "neon"))] { - // SIMD with different instructions for aligned and unaligned loads and stores. - // -@@ -914,16 +1153,19 @@ cfg_if! { - // but the benchmark results I see don't agree. - - pub const SIMD_STRIDE_SIZE: usize = 16; - - pub const MAX_STRIDE_SIZE: usize = 16; - - pub const SIMD_ALIGNMENT_MASK: usize = 15; - -+ // Safety for stride macros: We stick to the load8_aligned/etc family of functions. We consistently name -+ // aligned/unaligned functions according to src/dst being aligned/unaligned -+ - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_both_aligned, load16_aligned, store16_aligned); - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_src_aligned, load16_aligned, store16_unaligned); - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_dst_aligned, load16_unaligned, store16_aligned); - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_neither_aligned, load16_unaligned, store16_unaligned); - - ascii_to_basic_latin_simd_stride!(ascii_to_basic_latin_stride_both_aligned, load16_aligned, store8_aligned); - ascii_to_basic_latin_simd_stride!(ascii_to_basic_latin_stride_src_aligned, load16_aligned, store8_unaligned); - ascii_to_basic_latin_simd_stride!(ascii_to_basic_latin_stride_dst_aligned, load16_unaligned, store8_aligned); -@@ -939,36 +1181,43 @@ cfg_if! { - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_dst_aligned, load8_unaligned, store16_aligned); - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_neither_aligned, load8_unaligned, store16_unaligned); - - pack_simd_stride!(pack_stride_both_aligned, load8_aligned, store16_aligned); - pack_simd_stride!(pack_stride_src_aligned, load8_aligned, store16_unaligned); - pack_simd_stride!(pack_stride_dst_aligned, load8_unaligned, store16_aligned); - pack_simd_stride!(pack_stride_neither_aligned, load8_unaligned, store16_unaligned); - -+ // Safety for conversion macros: We use the correct pattern of both/src/dst/neither here. All stride functions were produced -+ // by stride macros that universally munch a single SIMD_STRIDE_SIZE worth of elements. -+ - ascii_simd_check_align!(ascii_to_ascii, u8, u8, ascii_to_ascii_stride_both_aligned, ascii_to_ascii_stride_src_aligned, ascii_to_ascii_stride_dst_aligned, ascii_to_ascii_stride_neither_aligned); - ascii_simd_check_align!(ascii_to_basic_latin, u8, u16, ascii_to_basic_latin_stride_both_aligned, ascii_to_basic_latin_stride_src_aligned, ascii_to_basic_latin_stride_dst_aligned, ascii_to_basic_latin_stride_neither_aligned); - ascii_simd_check_align!(basic_latin_to_ascii, u16, u8, basic_latin_to_ascii_stride_both_aligned, basic_latin_to_ascii_stride_src_aligned, basic_latin_to_ascii_stride_dst_aligned, basic_latin_to_ascii_stride_neither_aligned); - latin1_simd_check_align!(unpack_latin1, u8, u16, unpack_stride_both_aligned, unpack_stride_src_aligned, unpack_stride_dst_aligned, unpack_stride_neither_aligned); - latin1_simd_check_align!(pack_latin1, u16, u8, pack_stride_both_aligned, pack_stride_src_aligned, pack_stride_dst_aligned, pack_stride_neither_aligned); - } else if #[cfg(all(feature = "simd-accel", target_feature = "sse2"))] { - // SIMD with different instructions for aligned and unaligned loads and stores. - // - // Newer microarchitectures are not supposed to have a performance difference between - // aligned and unaligned SSE2 loads and stores when the address is actually aligned, - // but the benchmark results I see don't agree. - - pub const SIMD_STRIDE_SIZE: usize = 16; - -+ /// Safety-usable invariant: This should be identical to SIMD_STRIDE_SIZE (used by ascii_simd_check_align_unrolled) - pub const SIMD_ALIGNMENT: usize = 16; - - pub const MAX_STRIDE_SIZE: usize = 16; - - pub const SIMD_ALIGNMENT_MASK: usize = 15; - -+ // Safety for stride macros: We stick to the load8_aligned/etc family of functions. We consistently name -+ // aligned/unaligned functions according to src/dst being aligned/unaligned -+ - ascii_to_ascii_simd_double_stride!(ascii_to_ascii_simd_double_stride_both_aligned, store16_aligned); - ascii_to_ascii_simd_double_stride!(ascii_to_ascii_simd_double_stride_src_aligned, store16_unaligned); - - ascii_to_basic_latin_simd_double_stride!(ascii_to_basic_latin_simd_double_stride_both_aligned, store8_aligned); - ascii_to_basic_latin_simd_double_stride!(ascii_to_basic_latin_simd_double_stride_src_aligned, store8_unaligned); - - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_both_aligned, load16_aligned, store16_aligned); - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_src_aligned, load16_aligned, store16_unaligned); -@@ -984,33 +1233,43 @@ cfg_if! { - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_both_aligned, load8_aligned, store16_aligned); - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_src_aligned, load8_aligned, store16_unaligned); - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_dst_aligned, load8_unaligned, store16_aligned); - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_neither_aligned, load8_unaligned, store16_unaligned); - - pack_simd_stride!(pack_stride_both_aligned, load8_aligned, store16_aligned); - pack_simd_stride!(pack_stride_src_aligned, load8_aligned, store16_unaligned); - -+ // Safety for conversion macros: We use the correct pattern of both/src/dst/neither/double_both/double_src here. All stride functions were produced -+ // by stride macros that universally munch a single SIMD_STRIDE_SIZE worth of elements. -+ - ascii_simd_check_align_unrolled!(ascii_to_ascii, u8, u8, ascii_to_ascii_stride_both_aligned, ascii_to_ascii_stride_src_aligned, ascii_to_ascii_stride_neither_aligned, ascii_to_ascii_simd_double_stride_both_aligned, ascii_to_ascii_simd_double_stride_src_aligned); - ascii_simd_check_align_unrolled!(ascii_to_basic_latin, u8, u16, ascii_to_basic_latin_stride_both_aligned, ascii_to_basic_latin_stride_src_aligned, ascii_to_basic_latin_stride_neither_aligned, ascii_to_basic_latin_simd_double_stride_both_aligned, ascii_to_basic_latin_simd_double_stride_src_aligned); - - ascii_simd_check_align!(basic_latin_to_ascii, u16, u8, basic_latin_to_ascii_stride_both_aligned, basic_latin_to_ascii_stride_src_aligned, basic_latin_to_ascii_stride_dst_aligned, basic_latin_to_ascii_stride_neither_aligned); - latin1_simd_check_align_unrolled!(unpack_latin1, u8, u16, unpack_stride_both_aligned, unpack_stride_src_aligned, unpack_stride_dst_aligned, unpack_stride_neither_aligned); - latin1_simd_check_align_unrolled!(pack_latin1, u16, u8, pack_stride_both_aligned, pack_stride_src_aligned, pack_stride_dst_aligned, pack_stride_neither_aligned); - } else if #[cfg(all(target_endian = "little", target_pointer_width = "64"))] { - // Aligned ALU word, little-endian, 64-bit - -+ /// Safety invariant: this is the amount of bytes consumed by -+ /// unpack_alu. This will be twice the pointer width, as it consumes two usizes. -+ /// This is also the number of bytes produced by pack_alu. -+ /// This is also the number of u16 code units produced/consumed by unpack_alu/pack_alu respectively. - pub const ALU_STRIDE_SIZE: usize = 16; - - pub const MAX_STRIDE_SIZE: usize = 16; - -+ // Safety invariant: this is the pointer width in bytes - pub const ALU_ALIGNMENT: usize = 8; - -+ // Safety invariant: this is a mask for getting the bits of a pointer not aligned to ALU_ALIGNMENT - pub const ALU_ALIGNMENT_MASK: usize = 7; - -+ /// Safety: dst must point to valid space for writing four `usize`s - #[inline(always)] - unsafe fn unpack_alu(word: usize, second_word: usize, dst: *mut usize) { - let first = ((0x0000_0000_FF00_0000usize & word) << 24) | - ((0x0000_0000_00FF_0000usize & word) << 16) | - ((0x0000_0000_0000_FF00usize & word) << 8) | - (0x0000_0000_0000_00FFusize & word); - let second = ((0xFF00_0000_0000_0000usize & word) >> 8) | - ((0x00FF_0000_0000_0000usize & word) >> 16) | -@@ -1019,22 +1278,24 @@ cfg_if! { - let third = ((0x0000_0000_FF00_0000usize & second_word) << 24) | - ((0x0000_0000_00FF_0000usize & second_word) << 16) | - ((0x0000_0000_0000_FF00usize & second_word) << 8) | - (0x0000_0000_0000_00FFusize & second_word); - let fourth = ((0xFF00_0000_0000_0000usize & second_word) >> 8) | - ((0x00FF_0000_0000_0000usize & second_word) >> 16) | - ((0x0000_FF00_0000_0000usize & second_word) >> 24) | - ((0x0000_00FF_0000_0000usize & second_word) >> 32); -+ // Safety: fn invariant used here - *dst = first; - *(dst.add(1)) = second; - *(dst.add(2)) = third; - *(dst.add(3)) = fourth; - } - -+ /// Safety: dst must point to valid space for writing two `usize`s - #[inline(always)] - unsafe fn pack_alu(first: usize, second: usize, third: usize, fourth: usize, dst: *mut usize) { - let word = ((0x00FF_0000_0000_0000usize & second) << 8) | - ((0x0000_00FF_0000_0000usize & second) << 16) | - ((0x0000_0000_00FF_0000usize & second) << 24) | - ((0x0000_0000_0000_00FFusize & second) << 32) | - ((0x00FF_0000_0000_0000usize & first) >> 24) | - ((0x0000_00FF_0000_0000usize & first) >> 16) | -@@ -1043,70 +1304,88 @@ cfg_if! { - let second_word = ((0x00FF_0000_0000_0000usize & fourth) << 8) | - ((0x0000_00FF_0000_0000usize & fourth) << 16) | - ((0x0000_0000_00FF_0000usize & fourth) << 24) | - ((0x0000_0000_0000_00FFusize & fourth) << 32) | - ((0x00FF_0000_0000_0000usize & third) >> 24) | - ((0x0000_00FF_0000_0000usize & third) >> 16) | - ((0x0000_0000_00FF_0000usize & third) >> 8) | - (0x0000_0000_0000_00FFusize & third); -+ // Safety: fn invariant used here - *dst = word; - *(dst.add(1)) = second_word; - } - } else if #[cfg(all(target_endian = "little", target_pointer_width = "32"))] { - // Aligned ALU word, little-endian, 32-bit - -+ /// Safety invariant: this is the amount of bytes consumed by -+ /// unpack_alu. This will be twice the pointer width, as it consumes two usizes. -+ /// This is also the number of bytes produced by pack_alu. -+ /// This is also the number of u16 code units produced/consumed by unpack_alu/pack_alu respectively. - pub const ALU_STRIDE_SIZE: usize = 8; - - pub const MAX_STRIDE_SIZE: usize = 8; - -+ // Safety invariant: this is the pointer width in bytes - pub const ALU_ALIGNMENT: usize = 4; - -+ // Safety invariant: this is a mask for getting the bits of a pointer not aligned to ALU_ALIGNMENT - pub const ALU_ALIGNMENT_MASK: usize = 3; - -+ /// Safety: dst must point to valid space for writing four `usize`s - #[inline(always)] - unsafe fn unpack_alu(word: usize, second_word: usize, dst: *mut usize) { - let first = ((0x0000_FF00usize & word) << 8) | - (0x0000_00FFusize & word); - let second = ((0xFF00_0000usize & word) >> 8) | - ((0x00FF_0000usize & word) >> 16); - let third = ((0x0000_FF00usize & second_word) << 8) | - (0x0000_00FFusize & second_word); - let fourth = ((0xFF00_0000usize & second_word) >> 8) | - ((0x00FF_0000usize & second_word) >> 16); -+ // Safety: fn invariant used here - *dst = first; - *(dst.add(1)) = second; - *(dst.add(2)) = third; - *(dst.add(3)) = fourth; - } - -+ /// Safety: dst must point to valid space for writing two `usize`s - #[inline(always)] - unsafe fn pack_alu(first: usize, second: usize, third: usize, fourth: usize, dst: *mut usize) { - let word = ((0x00FF_0000usize & second) << 8) | - ((0x0000_00FFusize & second) << 16) | - ((0x00FF_0000usize & first) >> 8) | - (0x0000_00FFusize & first); - let second_word = ((0x00FF_0000usize & fourth) << 8) | - ((0x0000_00FFusize & fourth) << 16) | - ((0x00FF_0000usize & third) >> 8) | - (0x0000_00FFusize & third); -+ // Safety: fn invariant used here - *dst = word; - *(dst.add(1)) = second_word; - } - } else if #[cfg(all(target_endian = "big", target_pointer_width = "64"))] { - // Aligned ALU word, big-endian, 64-bit - -+ /// Safety invariant: this is the amount of bytes consumed by -+ /// unpack_alu. This will be twice the pointer width, as it consumes two usizes. -+ /// This is also the number of bytes produced by pack_alu. -+ /// This is also the number of u16 code units produced/consumed by unpack_alu/pack_alu respectively. - pub const ALU_STRIDE_SIZE: usize = 16; - - pub const MAX_STRIDE_SIZE: usize = 16; - -+ // Safety invariant: this is the pointer width in bytes - pub const ALU_ALIGNMENT: usize = 8; - -+ // Safety invariant: this is a mask for getting the bits of a pointer not aligned to ALU_ALIGNMENT - pub const ALU_ALIGNMENT_MASK: usize = 7; - -+ /// Safety: dst must point to valid space for writing four `usize`s - #[inline(always)] - unsafe fn unpack_alu(word: usize, second_word: usize, dst: *mut usize) { - let first = ((0xFF00_0000_0000_0000usize & word) >> 8) | - ((0x00FF_0000_0000_0000usize & word) >> 16) | - ((0x0000_FF00_0000_0000usize & word) >> 24) | - ((0x0000_00FF_0000_0000usize & word) >> 32); - let second = ((0x0000_0000_FF00_0000usize & word) << 24) | - ((0x0000_0000_00FF_0000usize & word) << 16) | -@@ -1115,22 +1394,24 @@ cfg_if! { - let third = ((0xFF00_0000_0000_0000usize & second_word) >> 8) | - ((0x00FF_0000_0000_0000usize & second_word) >> 16) | - ((0x0000_FF00_0000_0000usize & second_word) >> 24) | - ((0x0000_00FF_0000_0000usize & second_word) >> 32); - let fourth = ((0x0000_0000_FF00_0000usize & second_word) << 24) | - ((0x0000_0000_00FF_0000usize & second_word) << 16) | - ((0x0000_0000_0000_FF00usize & second_word) << 8) | - (0x0000_0000_0000_00FFusize & second_word); -+ // Safety: fn invariant used here - *dst = first; - *(dst.add(1)) = second; - *(dst.add(2)) = third; - *(dst.add(3)) = fourth; - } - -+ /// Safety: dst must point to valid space for writing two `usize`s - #[inline(always)] - unsafe fn pack_alu(first: usize, second: usize, third: usize, fourth: usize, dst: *mut usize) { - let word = ((0x00FF0000_00000000usize & first) << 8) | - ((0x000000FF_00000000usize & first) << 16) | - ((0x00000000_00FF0000usize & first) << 24) | - ((0x00000000_000000FFusize & first) << 32) | - ((0x00FF0000_00000000usize & second) >> 24) | - ((0x000000FF_00000000usize & second) >> 16) | -@@ -1139,67 +1420,80 @@ cfg_if! { - let second_word = ((0x00FF0000_00000000usize & third) << 8) | - ((0x000000FF_00000000usize & third) << 16) | - ((0x00000000_00FF0000usize & third) << 24) | - ((0x00000000_000000FFusize & third) << 32) | - ((0x00FF0000_00000000usize & fourth) >> 24) | - ((0x000000FF_00000000usize & fourth) >> 16) | - ((0x00000000_00FF0000usize & fourth) >> 8) | - (0x00000000_000000FFusize & fourth); -+ // Safety: fn invariant used here - *dst = word; - *(dst.add(1)) = second_word; - } - } else if #[cfg(all(target_endian = "big", target_pointer_width = "32"))] { - // Aligned ALU word, big-endian, 32-bit - -+ /// Safety invariant: this is the amount of bytes consumed by -+ /// unpack_alu. This will be twice the pointer width, as it consumes two usizes. -+ /// This is also the number of bytes produced by pack_alu. -+ /// This is also the number of u16 code units produced/consumed by unpack_alu/pack_alu respectively. - pub const ALU_STRIDE_SIZE: usize = 8; - - pub const MAX_STRIDE_SIZE: usize = 8; - -+ // Safety invariant: this is the pointer width in bytes - pub const ALU_ALIGNMENT: usize = 4; - -+ // Safety invariant: this is a mask for getting the bits of a pointer not aligned to ALU_ALIGNMENT - pub const ALU_ALIGNMENT_MASK: usize = 3; - -+ /// Safety: dst must point to valid space for writing four `usize`s - #[inline(always)] - unsafe fn unpack_alu(word: usize, second_word: usize, dst: *mut usize) { - let first = ((0xFF00_0000usize & word) >> 8) | - ((0x00FF_0000usize & word) >> 16); - let second = ((0x0000_FF00usize & word) << 8) | - (0x0000_00FFusize & word); - let third = ((0xFF00_0000usize & second_word) >> 8) | - ((0x00FF_0000usize & second_word) >> 16); - let fourth = ((0x0000_FF00usize & second_word) << 8) | - (0x0000_00FFusize & second_word); -+ // Safety: fn invariant used here - *dst = first; - *(dst.add(1)) = second; - *(dst.add(2)) = third; - *(dst.add(3)) = fourth; - } - -+ /// Safety: dst must point to valid space for writing two `usize`s - #[inline(always)] - unsafe fn pack_alu(first: usize, second: usize, third: usize, fourth: usize, dst: *mut usize) { - let word = ((0x00FF_0000usize & first) << 8) | - ((0x0000_00FFusize & first) << 16) | - ((0x00FF_0000usize & second) >> 8) | - (0x0000_00FFusize & second); - let second_word = ((0x00FF_0000usize & third) << 8) | - ((0x0000_00FFusize & third) << 16) | - ((0x00FF_0000usize & fourth) >> 8) | - (0x0000_00FFusize & fourth); -+ // Safety: fn invariant used here - *dst = word; - *(dst.add(1)) = second_word; - } - } else { - ascii_naive!(ascii_to_ascii, u8, u8); - ascii_naive!(ascii_to_basic_latin, u8, u16); - ascii_naive!(basic_latin_to_ascii, u16, u8); - } - } - - cfg_if! { -+ // Safety-usable invariant: this counts the zeroes from the "first byte" of utf-8 data packed into a usize -+ // with the target endianness - if #[cfg(target_endian = "little")] { - #[allow(dead_code)] - #[inline(always)] - fn count_zeros(word: usize) -> u32 { - word.trailing_zeros() - } - } else { - #[allow(dead_code)] -@@ -1207,208 +1501,272 @@ cfg_if! { - fn count_zeros(word: usize) -> u32 { - word.leading_zeros() - } - } - } - - cfg_if! { - if #[cfg(all(feature = "simd-accel", target_endian = "little", target_arch = "disabled"))] { -+ /// Safety-usable invariant: Will return the value and position of the first non-ASCII byte in the slice in a Some if found. -+ /// In other words, the first element of the Some is always `> 127` - #[inline(always)] - pub fn validate_ascii(slice: &[u8]) -> Option<(u8, usize)> { - let src = slice.as_ptr(); - let len = slice.len(); - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `stride` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - loop { -+ // Safety: src at offset is valid for a `SIMD_STRIDE_SIZE` read - let simd = unsafe { load16_unaligned(src.add(offset)) }; - if !simd_is_ascii(simd) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - while offset < len { - let code_unit = slice[offset]; - if code_unit > 127 { -+ // Safety: Safety-usable invariant upheld here - return Some((code_unit, offset)); - } - offset += 1; - } - None - } - } else if #[cfg(all(feature = "simd-accel", target_feature = "sse2"))] { -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found - #[inline(always)] - pub fn validate_ascii(slice: &[u8]) -> Option<(u8, usize)> { - let src = slice.as_ptr(); - let len = slice.len(); - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading at least `stride` elements. - if SIMD_STRIDE_SIZE <= len { - // First, process one unaligned vector -+ // Safety: src is valid for a `SIMD_STRIDE_SIZE` read - let simd = unsafe { load16_unaligned(src) }; - let mask = mask_ascii(simd); - if mask != 0 { - offset = mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; - return Some((non_ascii, offset)); - } - offset = SIMD_STRIDE_SIZE; -+ // Safety: Now that offset has changed we don't yet know how much it is valid for - - // We have now seen 16 ASCII bytes. Let's guess that - // there will be enough more to justify more expense - // in the case of non-ASCII. - // Use aligned reads for the sake of old microachitectures. -+ // Safety: this correctly calculates the number of src_units that need to be read before the remaining list is aligned. -+ // This is by definition less than SIMD_ALIGNMENT, which is defined to be equal to SIMD_STRIDE_SIZE. - let until_alignment = unsafe { (SIMD_ALIGNMENT - ((src.add(offset) as usize) & SIMD_ALIGNMENT_MASK)) & SIMD_ALIGNMENT_MASK }; - // This addition won't overflow, because even in the 32-bit PAE case the - // address space holds enough code that the slice length can't be that - // close to address space size. - // offset now equals SIMD_STRIDE_SIZE, hence times 3 below. -+ // -+ // Safety: if this check succeeds we're valid for reading at least `2 * SIMD_STRIDE_SIZE` elements plus `until_alignment`. -+ // The extra SIMD_STRIDE_SIZE in the condition is because `offset` is already `SIMD_STRIDE_SIZE`. - if until_alignment + (SIMD_STRIDE_SIZE * 3) <= len { - if until_alignment != 0 { -+ // Safety: this is safe to call since we're valid for this read (and more), and don't care about alignment -+ // This will copy over bytes that get decoded twice since it's not incrementing `offset` by SIMD_STRIDE_SIZE. This is fine. - let simd = unsafe { load16_unaligned(src.add(offset)) }; - let mask = mask_ascii(simd); - if mask != 0 { - offset += mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; - return Some((non_ascii, offset)); - } - offset += until_alignment; - } -+ // Safety: At this point we're valid for reading 2*SIMD_STRIDE_SIZE elements -+ // Safety: Now `offset` is aligned for `src` - let len_minus_stride_times_two = len - (SIMD_STRIDE_SIZE * 2); - loop { -+ // Safety: We were valid for this read, and were aligned. - let first = unsafe { load16_aligned(src.add(offset)) }; - let second = unsafe { load16_aligned(src.add(offset + SIMD_STRIDE_SIZE)) }; - if !simd_is_ascii(first | second) { -+ // Safety: mask_ascii produces a mask of all the high bits. - let mask_first = mask_ascii(first); - if mask_first != 0 { -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src -+ // TODO SAFETY: What about big-endian systems? - offset += mask_first.trailing_zeros() as usize; - } else { - let mask_second = mask_ascii(second); -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src - offset += SIMD_STRIDE_SIZE + mask_second.trailing_zeros() as usize; - } -+ // Safety: We know this is non-ASCII, and can uphold the safety-usable invariant here - let non_ascii = unsafe { *src.add(offset) }; -+ - return Some((non_ascii, offset)); - } - offset += SIMD_STRIDE_SIZE * 2; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride_times_two { - break; - } - } -+ // Safety: if this check succeeds we're valid for reading at least `SIMD_STRIDE_SIZE` - if offset + SIMD_STRIDE_SIZE <= len { -- let simd = unsafe { load16_aligned(src.add(offset)) }; -- let mask = mask_ascii(simd); -+ // Safety: We were valid for this read, and were aligned. -+ let simd = unsafe { load16_aligned(src.add(offset)) }; -+ // Safety: mask_ascii produces a mask of all the high bits. -+ let mask = mask_ascii(simd); - if mask != 0 { -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src - offset += mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; -+ // Safety: We know this is non-ASCII, and can uphold the safety-usable invariant here - return Some((non_ascii, offset)); - } - offset += SIMD_STRIDE_SIZE; - } - } else { -+ // Safety: this is the unaligned branch - // At most two iterations, so unroll -+ // Safety: if this check succeeds we're valid for reading at least `SIMD_STRIDE_SIZE` - if offset + SIMD_STRIDE_SIZE <= len { -+ // Safety: We're valid for this read but must use an unaligned read - let simd = unsafe { load16_unaligned(src.add(offset)) }; - let mask = mask_ascii(simd); - if mask != 0 { - offset += mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; -+ // Safety-usable invariant upheld here (same as above) - return Some((non_ascii, offset)); - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: if this check succeeds we're valid for reading at least `SIMD_STRIDE_SIZE` - if offset + SIMD_STRIDE_SIZE <= len { -+ // Safety: We're valid for this read but must use an unaligned read - let simd = unsafe { load16_unaligned(src.add(offset)) }; - let mask = mask_ascii(simd); - if mask != 0 { - offset += mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; -+ // Safety-usable invariant upheld here (same as above) - return Some((non_ascii, offset)); - } - offset += SIMD_STRIDE_SIZE; - } - } - } - } - while offset < len { -+ // Safety: relies straightforwardly on the `len` invariant - let code_unit = unsafe { *(src.add(offset)) }; - if code_unit > 127 { -+ // Safety-usable invariant upheld here - return Some((code_unit, offset)); - } - offset += 1; - } - None - } - } else { -+ // Safety-usable invariant: returns byte index of first non-ascii byte - #[inline(always)] - fn find_non_ascii(word: usize, second_word: usize) -> Option { - let word_masked = word & ASCII_MASK; - let second_masked = second_word & ASCII_MASK; - if (word_masked | second_masked) == 0 { -+ // Both are ascii, invariant upheld - return None; - } - if word_masked != 0 { - let zeros = count_zeros(word_masked); -- // `zeros` now contains 7 (for the seven bits of non-ASCII) -+ // `zeros` now contains 0 to 7 (for the seven bits of masked ASCII in little endian, -+ // or up to 7 bits of non-ASCII in big endian if the first byte is non-ASCII) - // plus 8 times the number of ASCII in text order before the - // non-ASCII byte in the little-endian case or 8 times the number of ASCII in - // text order before the non-ASCII byte in the big-endian case. - let num_ascii = (zeros >> 3) as usize; -+ // Safety-usable invariant upheld here - return Some(num_ascii); - } - let zeros = count_zeros(second_masked); -- // `zeros` now contains 7 (for the seven bits of non-ASCII) -+ // `zeros` now contains 0 to 7 (for the seven bits of masked ASCII in little endian, -+ // or up to 7 bits of non-ASCII in big endian if the first byte is non-ASCII) - // plus 8 times the number of ASCII in text order before the - // non-ASCII byte in the little-endian case or 8 times the number of ASCII in - // text order before the non-ASCII byte in the big-endian case. - let num_ascii = (zeros >> 3) as usize; -+ // Safety-usable invariant upheld here - Some(ALU_ALIGNMENT + num_ascii) - } - -+ /// Safety: `src` must be valid for the reads of two `usize`s -+ /// -+ /// Safety-usable invariant: will return byte index of first non-ascii byte - #[inline(always)] - unsafe fn validate_ascii_stride(src: *const usize) -> Option { - let word = *src; - let second_word = *(src.add(1)); - find_non_ascii(word, second_word) - } - -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found - #[cfg_attr(feature = "cargo-clippy", allow(cast_ptr_alignment))] - #[inline(always)] - pub fn validate_ascii(slice: &[u8]) -> Option<(u8, usize)> { - let src = slice.as_ptr(); - let len = slice.len(); - let mut offset = 0usize; - let mut until_alignment = (ALU_ALIGNMENT - ((src as usize) & ALU_ALIGNMENT_MASK)) & ALU_ALIGNMENT_MASK; -+ // Safety: If this check fails we're valid to read `until_alignment + ALU_STRIDE_SIZE` elements - if until_alignment + ALU_STRIDE_SIZE <= len { - while until_alignment != 0 { - let code_unit = slice[offset]; - if code_unit > 127 { -+ // Safety-usable invairant upheld here - return Some((code_unit, offset)); - } - offset += 1; - until_alignment -= 1; - } -+ // Safety: At this point we have read until_alignment elements and -+ // are valid for `ALU_STRIDE_SIZE` more. - let len_minus_stride = len - ALU_STRIDE_SIZE; - loop { -+ // Safety: we were valid for this read - let ptr = unsafe { src.add(offset) as *const usize }; - if let Some(num_ascii) = unsafe { validate_ascii_stride(ptr) } { - offset += num_ascii; -+ // Safety-usable invairant upheld here using the invariant from validate_ascii_stride() - return Some((unsafe { *(src.add(offset)) }, offset)); - } - offset += ALU_STRIDE_SIZE; -+ // Safety: This is `offset > ALU_STRIDE_SIZE` which means we always have at least `2 * ALU_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - while offset < len { - let code_unit = slice[offset]; - if code_unit > 127 { -+ // Safety-usable invairant upheld here - return Some((code_unit, offset)); - } - offset += 1; - } - None - } - - } -@@ -1423,70 +1781,88 @@ cfg_if! { - // vector reads without vector writes. - - pub const ALU_STRIDE_SIZE: usize = 8; - - pub const ALU_ALIGNMENT: usize = 4; - - pub const ALU_ALIGNMENT_MASK: usize = 3; - } else { -+ // Safety: src points to two valid `usize`s, dst points to four valid `usize`s - #[inline(always)] - unsafe fn unpack_latin1_stride_alu(src: *const usize, dst: *mut usize) { -+ // Safety: src safety invariant used here - let word = *src; - let second_word = *(src.add(1)); -+ // Safety: dst safety invariant passed down - unpack_alu(word, second_word, dst); - } - -+ // Safety: src points to four valid `usize`s, dst points to two valid `usize`s - #[inline(always)] - unsafe fn pack_latin1_stride_alu(src: *const usize, dst: *mut usize) { -+ // Safety: src safety invariant used here - let first = *src; - let second = *(src.add(1)); - let third = *(src.add(2)); - let fourth = *(src.add(3)); -+ // Safety: dst safety invariant passed down - pack_alu(first, second, third, fourth, dst); - } - -+ // Safety: src points to two valid `usize`s, dst points to four valid `usize`s - #[inline(always)] - unsafe fn ascii_to_basic_latin_stride_alu(src: *const usize, dst: *mut usize) -> bool { -+ // Safety: src safety invariant used here - let word = *src; - let second_word = *(src.add(1)); - // Check if the words contains non-ASCII - if (word & ASCII_MASK) | (second_word & ASCII_MASK) != 0 { - return false; - } -+ // Safety: dst safety invariant passed down - unpack_alu(word, second_word, dst); - true - } - -+ // Safety: src points four valid `usize`s, dst points to two valid `usize`s - #[inline(always)] - unsafe fn basic_latin_to_ascii_stride_alu(src: *const usize, dst: *mut usize) -> bool { -+ // Safety: src safety invariant used here - let first = *src; - let second = *(src.add(1)); - let third = *(src.add(2)); - let fourth = *(src.add(3)); - if (first & BASIC_LATIN_MASK) | (second & BASIC_LATIN_MASK) | (third & BASIC_LATIN_MASK) | (fourth & BASIC_LATIN_MASK) != 0 { - return false; - } -+ // Safety: dst safety invariant passed down - pack_alu(first, second, third, fourth, dst); - true - } - -+ // Safety: src, dst both point to two valid `usize`s each -+ // Safety-usable invariant: Will return byte index of first non-ascii byte. - #[inline(always)] - unsafe fn ascii_to_ascii_stride(src: *const usize, dst: *mut usize) -> Option { -+ // Safety: src safety invariant used here - let word = *src; - let second_word = *(src.add(1)); -+ // Safety: src safety invariant used here - *dst = word; - *(dst.add(1)) = second_word; -+ // Relies on safety-usable invariant here - find_non_ascii(word, second_word) - } - - basic_latin_alu!(ascii_to_basic_latin, u8, u16, ascii_to_basic_latin_stride_alu); - basic_latin_alu!(basic_latin_to_ascii, u16, u8, basic_latin_to_ascii_stride_alu); - latin1_alu!(unpack_latin1, u8, u16, unpack_latin1_stride_alu); - latin1_alu!(pack_latin1, u16, u8, pack_latin1_stride_alu); -+ // Safety invariant upheld: ascii_to_ascii_stride will return byte index of first non-ascii if found - ascii_alu!(ascii_to_ascii, u8, u8, ascii_to_ascii_stride); - } - } - - pub fn ascii_valid_up_to(bytes: &[u8]) -> usize { - match validate_ascii(bytes) { - None => bytes.len(), - Some((_, num_valid)) => num_valid, -diff --git a/third_party/rust/encoding_rs/src/handles.rs b/third_party/rust/encoding_rs/src/handles.rs ---- a/third_party/rust/encoding_rs/src/handles.rs -+++ b/third_party/rust/encoding_rs/src/handles.rs -@@ -29,17 +29,17 @@ use crate::simd_funcs::*; - #[cfg(all( - feature = "simd-accel", - any( - target_feature = "sse2", - all(target_endian = "little", target_arch = "aarch64"), - all(target_endian = "little", target_feature = "neon") - ) - ))] --use packed_simd::u16x8; -+use core::simd::u16x8; - - use super::DecoderResult; - use super::EncoderResult; - use crate::ascii::*; - use crate::utf_8::convert_utf8_to_utf16_up_to_invalid; - use crate::utf_8::utf8_valid_up_to; - - pub enum Space { -@@ -85,84 +85,100 @@ impl Endian for LittleEndian { - const OPPOSITE_ENDIAN: bool = false; - - #[cfg(target_endian = "big")] - const OPPOSITE_ENDIAN: bool = true; - } - - #[derive(Debug, Copy, Clone)] - struct UnalignedU16Slice { -+ // Safety invariant: ptr must be valid for reading 2*len bytes - ptr: *const u8, - len: usize, - } - - impl UnalignedU16Slice { -+ /// Safety: ptr must be valid for reading 2*len bytes - #[inline(always)] - pub unsafe fn new(ptr: *const u8, len: usize) -> UnalignedU16Slice { -+ // Safety: field invariant passed up to caller here - UnalignedU16Slice { ptr, len } - } - - #[inline(always)] - pub fn trim_last(&mut self) { - assert!(self.len > 0); -+ // Safety: invariant upheld here: a slice is still valid with a shorter len - self.len -= 1; - } - - #[inline(always)] - pub fn at(&self, i: usize) -> u16 { - use core::mem::MaybeUninit; - - assert!(i < self.len); - unsafe { - let mut u: MaybeUninit = MaybeUninit::uninit(); -+ // Safety: i is at most len - 1, which works here - ::core::ptr::copy_nonoverlapping(self.ptr.add(i * 2), u.as_mut_ptr() as *mut u8, 2); -+ // Safety: valid read above lets us do this - u.assume_init() - } - } - - #[cfg(feature = "simd-accel")] - #[inline(always)] - pub fn simd_at(&self, i: usize) -> u16x8 { -+ // Safety: i/len are on the scale of u16s, each one corresponds to 2 u8s - assert!(i + SIMD_STRIDE_SIZE / 2 <= self.len); - let byte_index = i * 2; -+ // Safety: load16_unaligned needs SIMD_STRIDE_SIZE=16 u8 elements to read, -+ // or 16/2 = 8 u16 elements to read. -+ // We have checked that we have at least that many above. -+ - unsafe { to_u16_lanes(load16_unaligned(self.ptr.add(byte_index))) } - } - - #[inline(always)] - pub fn len(&self) -> usize { - self.len - } - - #[inline(always)] - pub fn tail(&self, from: usize) -> UnalignedU16Slice { - // XXX the return value should be restricted not to - // outlive self. - assert!(from <= self.len); -+ // Safety: This upholds the same invariant: `from` is in bounds and we're returning a shorter slice - unsafe { UnalignedU16Slice::new(self.ptr.add(from * 2), self.len - from) } - } - - #[cfg(feature = "simd-accel")] - #[inline(always)] - pub fn copy_bmp_to(&self, other: &mut [u16]) -> Option<(u16, usize)> { - assert!(self.len <= other.len()); - let mut offset = 0; -+ // Safety: SIMD_STRIDE_SIZE is measured in bytes, whereas len is in u16s. We check we can -+ // munch SIMD_STRIDE_SIZE / 2 u16s which means we can write SIMD_STRIDE_SIZE u8s - if SIMD_STRIDE_SIZE / 2 <= self.len { - let len_minus_stride = self.len - SIMD_STRIDE_SIZE / 2; - loop { - let mut simd = self.simd_at(offset); - if E::OPPOSITE_ENDIAN { - simd = simd_byte_swap(simd); - } -+ // Safety: we have enough space on the other side to write this - unsafe { - store8_unaligned(other.as_mut_ptr().add(offset), simd); - } - if contains_surrogates(simd) { - break; - } - offset += SIMD_STRIDE_SIZE / 2; -+ // Safety: This ensures we still have space for writing SIMD_STRIDE_SIZE u8s - if offset > len_minus_stride { - break; - } - } - } - while offset < self.len { - let unit = swap_if_opposite_endian::(self.at(offset)); - other[offset] = unit; -@@ -231,33 +247,37 @@ fn copy_unaligned_basic_latin_to_ascii( - src: UnalignedU16Slice, - dst: &mut [u8], - ) -> CopyAsciiResult { - let len = ::core::cmp::min(src.len(), dst.len()); - let mut offset = 0; -+ // Safety: This check ensures we are able to read/write at least SIMD_STRIDE_SIZE elements - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - loop { - let mut first = src.simd_at(offset); - let mut second = src.simd_at(offset + (SIMD_STRIDE_SIZE / 2)); - if E::OPPOSITE_ENDIAN { - first = simd_byte_swap(first); - second = simd_byte_swap(second); - } - if !simd_is_basic_latin(first | second) { - break; - } - let packed = simd_pack(first, second); -+ // Safety: We are able to write SIMD_STRIDE_SIZE elements in this iteration - unsafe { - store16_unaligned(dst.as_mut_ptr().add(offset), packed); - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which ensures that we can write at least SIMD_STRIDE_SIZE elements -+ // in the next iteration - if offset > len_minus_stride { - break; - } - } - } - copy_unaligned_basic_latin_to_ascii_alu::(src.tail(offset), &mut dst[offset..], offset) - } - -@@ -632,94 +652,106 @@ impl<'a> Utf16Destination<'a> { - #[inline(always)] - fn write_astral(&mut self, astral: u32) { - debug_assert!(astral > 0xFFFF); - debug_assert!(astral <= 0x10_FFFF); - self.write_code_unit((0xD7C0 + (astral >> 10)) as u16); - self.write_code_unit((0xDC00 + (astral & 0x3FF)) as u16); - } - #[inline(always)] -- pub fn write_surrogate_pair(&mut self, high: u16, low: u16) { -+ fn write_surrogate_pair(&mut self, high: u16, low: u16) { - self.write_code_unit(high); - self.write_code_unit(low); - } - #[inline(always)] - fn write_big5_combination(&mut self, combined: u16, combining: u16) { - self.write_bmp_excl_ascii(combined); - self.write_bmp_excl_ascii(combining); - } -+ // Safety-usable invariant: CopyAsciiResult::GoOn will only contain bytes >=0x80 - #[inline(always)] - pub fn copy_ascii_from_check_space_bmp<'b>( - &'b mut self, - source: &mut ByteSource, - ) -> CopyAsciiResult<(DecoderResult, usize, usize), (u8, Utf16BmpHandle<'b, 'a>)> { - let non_ascii_ret = { - let src_remaining = &source.slice[source.pos..]; - let dst_remaining = &mut self.slice[self.pos..]; - let (pending, length) = if dst_remaining.len() < src_remaining.len() { - (DecoderResult::OutputFull, dst_remaining.len()) - } else { - (DecoderResult::InputEmpty, src_remaining.len()) - }; -+ // Safety: This function is documented as needing valid pointers for src/dest and len, which -+ // is true since we've passed the minumum length of the two - match unsafe { - ascii_to_basic_latin(src_remaining.as_ptr(), dst_remaining.as_mut_ptr(), length) - } { - None => { - source.pos += length; - self.pos += length; - return CopyAsciiResult::Stop((pending, source.pos, self.pos)); - } -+ // Safety: the function is documented as returning bytes >=0x80 in the Some - Some((non_ascii, consumed)) => { - source.pos += consumed; - self.pos += consumed; - source.pos += 1; // +1 for non_ascii -+ // Safety: non-ascii bubbled out here - non_ascii - } - } - }; -+ // Safety: non-ascii returned here - CopyAsciiResult::GoOn((non_ascii_ret, Utf16BmpHandle::new(self))) - } -+ // Safety-usable invariant: CopyAsciiResult::GoOn will only contain bytes >=0x80 - #[inline(always)] - pub fn copy_ascii_from_check_space_astral<'b>( - &'b mut self, - source: &mut ByteSource, - ) -> CopyAsciiResult<(DecoderResult, usize, usize), (u8, Utf16AstralHandle<'b, 'a>)> { - let non_ascii_ret = { - let dst_len = self.slice.len(); - let src_remaining = &source.slice[source.pos..]; - let dst_remaining = &mut self.slice[self.pos..]; - let (pending, length) = if dst_remaining.len() < src_remaining.len() { - (DecoderResult::OutputFull, dst_remaining.len()) - } else { - (DecoderResult::InputEmpty, src_remaining.len()) - }; -+ // Safety: This function is documented as needing valid pointers for src/dest and len, which -+ // is true since we've passed the minumum length of the two - match unsafe { - ascii_to_basic_latin(src_remaining.as_ptr(), dst_remaining.as_mut_ptr(), length) - } { - None => { - source.pos += length; - self.pos += length; - return CopyAsciiResult::Stop((pending, source.pos, self.pos)); - } -+ // Safety: the function is documented as returning bytes >=0x80 in the Some - Some((non_ascii, consumed)) => { - source.pos += consumed; - self.pos += consumed; - if self.pos + 1 < dst_len { - source.pos += 1; // +1 for non_ascii -+ // Safety: non-ascii bubbled out here - non_ascii - } else { - return CopyAsciiResult::Stop(( - DecoderResult::OutputFull, - source.pos, - self.pos, - )); - } - } - } - }; -+ // Safety: non-ascii returned here - CopyAsciiResult::GoOn((non_ascii_ret, Utf16AstralHandle::new(self))) - } - #[inline(always)] - pub fn copy_utf8_up_to_invalid_from(&mut self, source: &mut ByteSource) { - let src_remaining = &source.slice[source.pos..]; - let dst_remaining = &mut self.slice[self.pos..]; - let (read, written) = convert_utf8_to_utf16_up_to_invalid(src_remaining, dst_remaining); - source.pos += read; -diff --git a/third_party/rust/encoding_rs/src/lib.rs b/third_party/rust/encoding_rs/src/lib.rs ---- a/third_party/rust/encoding_rs/src/lib.rs -+++ b/third_party/rust/encoding_rs/src/lib.rs -@@ -684,37 +684,26 @@ - //! TIS-620windows-874 - //! - //! - //! - //! See the section [_UTF-16LE, UTF-16BE and Unicode Encoding Schemes_](#utf-16le-utf-16be-and-unicode-encoding-schemes) - //! for discussion about the UTF-16 family. - - #![no_std] --#![cfg_attr(feature = "simd-accel", feature(core_intrinsics))] -+#![cfg_attr(feature = "simd-accel", feature(core_intrinsics, portable_simd))] - - #[cfg(feature = "alloc")] - #[cfg_attr(test, macro_use)] - extern crate alloc; - - extern crate core; - #[macro_use] - extern crate cfg_if; - --#[cfg(all( -- feature = "simd-accel", -- any( -- target_feature = "sse2", -- all(target_endian = "little", target_arch = "aarch64"), -- all(target_endian = "little", target_feature = "neon") -- ) --))] --#[macro_use(shuffle)] --extern crate packed_simd; -- - #[cfg(feature = "serde")] - extern crate serde; - - #[cfg(all(test, feature = "serde"))] - extern crate bincode; - #[cfg(all(test, feature = "serde"))] - #[macro_use] - extern crate serde_derive; -diff --git a/third_party/rust/encoding_rs/src/mem.rs b/third_party/rust/encoding_rs/src/mem.rs ---- a/third_party/rust/encoding_rs/src/mem.rs -+++ b/third_party/rust/encoding_rs/src/mem.rs -@@ -111,16 +111,21 @@ macro_rules! by_unit_check_alu { - until_alignment -= 1; - } - if accu >= $bound { - return false; - } - } - let len_minus_stride = len - ALU_ALIGNMENT / unit_size; - if offset + (4 * (ALU_ALIGNMENT / unit_size)) <= len { -+ // Safety: the above check lets us perform 4 consecutive reads of -+ // length ALU_ALIGNMENT / unit_size. ALU_ALIGNMENT is the size of usize, and unit_size -+ // is the size of the `src` pointer, so this is equal to performing four usize reads. -+ // -+ // This invariant is upheld on all loop iterations - let len_minus_unroll = len - (4 * (ALU_ALIGNMENT / unit_size)); - loop { - let unroll_accu = unsafe { *(src.add(offset) as *const usize) } - | unsafe { - *(src.add(offset + (ALU_ALIGNMENT / unit_size)) as *const usize) - } - | unsafe { - *(src.add(offset + (2 * (ALU_ALIGNMENT / unit_size))) -@@ -129,22 +134,24 @@ macro_rules! by_unit_check_alu { - | unsafe { - *(src.add(offset + (3 * (ALU_ALIGNMENT / unit_size))) - as *const usize) - }; - if unroll_accu & $mask != 0 { - return false; - } - offset += 4 * (ALU_ALIGNMENT / unit_size); -+ // Safety: this check lets us continue to perform the 4 reads earlier - if offset > len_minus_unroll { - break; - } - } - } - while offset <= len_minus_stride { -+ // Safety: the above check lets us perform one usize read. - accu |= unsafe { *(src.add(offset) as *const usize) }; - offset += ALU_ALIGNMENT / unit_size; - } - } - } - for &unit in &buffer[offset..] { - accu |= unit as usize; - } -@@ -184,16 +191,21 @@ macro_rules! by_unit_check_simd { - until_alignment -= 1; - } - if accu >= $bound { - return false; - } - } - let len_minus_stride = len - SIMD_STRIDE_SIZE / unit_size; - if offset + (4 * (SIMD_STRIDE_SIZE / unit_size)) <= len { -+ // Safety: the above check lets us perform 4 consecutive reads of -+ // length SIMD_STRIDE_SIZE / unit_size. SIMD_STRIDE_SIZE is the size of $simd_ty, and unit_size -+ // is the size of the `src` pointer, so this is equal to performing four $simd_ty reads. -+ // -+ // This invariant is upheld on all loop iterations - let len_minus_unroll = len - (4 * (SIMD_STRIDE_SIZE / unit_size)); - loop { - let unroll_accu = unsafe { *(src.add(offset) as *const $simd_ty) } - | unsafe { - *(src.add(offset + (SIMD_STRIDE_SIZE / unit_size)) - as *const $simd_ty) - } - | unsafe { -@@ -203,23 +215,25 @@ macro_rules! by_unit_check_simd { - | unsafe { - *(src.add(offset + (3 * (SIMD_STRIDE_SIZE / unit_size))) - as *const $simd_ty) - }; - if !$func(unroll_accu) { - return false; - } - offset += 4 * (SIMD_STRIDE_SIZE / unit_size); -+ // Safety: this check lets us continue to perform the 4 reads earlier - if offset > len_minus_unroll { - break; - } - } - } - let mut simd_accu = $splat; - while offset <= len_minus_stride { -+ // Safety: the above check lets us perform one $simd_ty read. - simd_accu = simd_accu | unsafe { *(src.add(offset) as *const $simd_ty) }; - offset += SIMD_STRIDE_SIZE / unit_size; - } - if !$func(simd_accu) { - return false; - } - } - } -@@ -229,18 +243,18 @@ macro_rules! by_unit_check_simd { - accu < $bound - } - }; - } - - cfg_if! { - if #[cfg(all(feature = "simd-accel", any(target_feature = "sse2", all(target_endian = "little", target_arch = "aarch64"), all(target_endian = "little", target_feature = "neon"))))] { - use crate::simd_funcs::*; -- use packed_simd::u8x16; -- use packed_simd::u16x8; -+ use core::simd::u8x16; -+ use core::simd::u16x8; - - const SIMD_ALIGNMENT: usize = 16; - - const SIMD_ALIGNMENT_MASK: usize = 15; - - by_unit_check_simd!(is_ascii_impl, u8, u8x16::splat(0), u8x16, 0x80, simd_is_ascii); - by_unit_check_simd!(is_basic_latin_impl, u16, u16x8::splat(0), u16x8, 0x80, simd_is_basic_latin); - by_unit_check_simd!(is_utf16_latin1_impl, u16, u16x8::splat(0), u16x8, 0x100, simd_is_latin1); -diff --git a/third_party/rust/encoding_rs/src/simd_funcs.rs b/third_party/rust/encoding_rs/src/simd_funcs.rs ---- a/third_party/rust/encoding_rs/src/simd_funcs.rs -+++ b/third_party/rust/encoding_rs/src/simd_funcs.rs -@@ -2,65 +2,84 @@ - // file at the top-level directory of this distribution. - // - // Licensed under the Apache License, Version 2.0 or the MIT license - // , at your - // option. This file may not be copied, modified, or distributed - // except according to those terms. - --use packed_simd::u16x8; --use packed_simd::u8x16; --use packed_simd::IntoBits; -+use any_all_workaround::all_mask16x8; -+use any_all_workaround::all_mask8x16; -+use any_all_workaround::any_mask16x8; -+use any_all_workaround::any_mask8x16; -+use core::simd::cmp::SimdPartialEq; -+use core::simd::cmp::SimdPartialOrd; -+use core::simd::mask16x8; -+use core::simd::mask8x16; -+use core::simd::simd_swizzle; -+use core::simd::u16x8; -+use core::simd::u8x16; -+use core::simd::ToBytes; - - // TODO: Migrate unaligned access to stdlib code if/when the RFC - // https://github.com/rust-lang/rfcs/pull/1725 is implemented. - -+/// Safety invariant: ptr must be valid for an unaligned read of 16 bytes - #[inline(always)] - pub unsafe fn load16_unaligned(ptr: *const u8) -> u8x16 { -- let mut simd = ::core::mem::uninitialized(); -- ::core::ptr::copy_nonoverlapping(ptr, &mut simd as *mut u8x16 as *mut u8, 16); -- simd -+ let mut simd = ::core::mem::MaybeUninit::::uninit(); -+ ::core::ptr::copy_nonoverlapping(ptr, simd.as_mut_ptr() as *mut u8, 16); -+ // Safety: copied 16 bytes of initialized memory into this, it is now initialized -+ simd.assume_init() - } - -+/// Safety invariant: ptr must be valid for an aligned-for-u8x16 read of 16 bytes - #[allow(dead_code)] - #[inline(always)] - pub unsafe fn load16_aligned(ptr: *const u8) -> u8x16 { - *(ptr as *const u8x16) - } - -+/// Safety invariant: ptr must be valid for an unaligned store of 16 bytes - #[inline(always)] - pub unsafe fn store16_unaligned(ptr: *mut u8, s: u8x16) { - ::core::ptr::copy_nonoverlapping(&s as *const u8x16 as *const u8, ptr, 16); - } - -+/// Safety invariant: ptr must be valid for an aligned-for-u8x16 store of 16 bytes - #[allow(dead_code)] - #[inline(always)] - pub unsafe fn store16_aligned(ptr: *mut u8, s: u8x16) { - *(ptr as *mut u8x16) = s; - } - -+/// Safety invariant: ptr must be valid for an unaligned read of 16 bytes - #[inline(always)] - pub unsafe fn load8_unaligned(ptr: *const u16) -> u16x8 { -- let mut simd = ::core::mem::uninitialized(); -- ::core::ptr::copy_nonoverlapping(ptr as *const u8, &mut simd as *mut u16x8 as *mut u8, 16); -- simd -+ let mut simd = ::core::mem::MaybeUninit::::uninit(); -+ ::core::ptr::copy_nonoverlapping(ptr as *const u8, simd.as_mut_ptr() as *mut u8, 16); -+ // Safety: copied 16 bytes of initialized memory into this, it is now initialized -+ simd.assume_init() - } - -+/// Safety invariant: ptr must be valid for an aligned-for-u16x8 read of 16 bytes - #[allow(dead_code)] - #[inline(always)] - pub unsafe fn load8_aligned(ptr: *const u16) -> u16x8 { - *(ptr as *const u16x8) - } - -+/// Safety invariant: ptr must be valid for an unaligned store of 16 bytes - #[inline(always)] - pub unsafe fn store8_unaligned(ptr: *mut u16, s: u16x8) { - ::core::ptr::copy_nonoverlapping(&s as *const u16x8 as *const u8, ptr as *mut u8, 16); - } - -+/// Safety invariant: ptr must be valid for an aligned-for-u16x8 store of 16 bytes - #[allow(dead_code)] - #[inline(always)] - pub unsafe fn store8_aligned(ptr: *mut u16, s: u16x8) { - *(ptr as *mut u16x8) = s; - } - - cfg_if! { - if #[cfg(all(target_feature = "sse2", target_arch = "x86_64"))] { -@@ -95,234 +114,241 @@ cfg_if! { - pub fn simd_byte_swap(s: u16x8) -> u16x8 { - let left = s << 8; - let right = s >> 8; - left | right - } - - #[inline(always)] - pub fn to_u16_lanes(s: u8x16) -> u16x8 { -- s.into_bits() -+ u16x8::from_ne_bytes(s) - } - - cfg_if! { - if #[cfg(target_feature = "sse2")] { - - // Expose low-level mask instead of higher-level conclusion, - // because the non-ASCII case would perform less well otherwise. -+ // Safety-usable invariant: This returned value is whether each high bit is set - #[inline(always)] - pub fn mask_ascii(s: u8x16) -> i32 { - unsafe { -- _mm_movemask_epi8(s.into_bits()) -+ _mm_movemask_epi8(s.into()) - } - } - - } else { - - } - } - - cfg_if! { - if #[cfg(target_feature = "sse2")] { - #[inline(always)] - pub fn simd_is_ascii(s: u8x16) -> bool { - unsafe { -- _mm_movemask_epi8(s.into_bits()) == 0 -+ // Safety: We have cfg()d the correct platform -+ _mm_movemask_epi8(s.into()) == 0 - } - } - } else if #[cfg(target_arch = "aarch64")]{ - #[inline(always)] - pub fn simd_is_ascii(s: u8x16) -> bool { - unsafe { -- vmaxvq_u8(s.into_bits()) < 0x80 -+ // Safety: We have cfg()d the correct platform -+ vmaxvq_u8(s.into()) < 0x80 - } - } - } else { - #[inline(always)] - pub fn simd_is_ascii(s: u8x16) -> bool { - // This optimizes better on ARM than - // the lt formulation. - let highest_ascii = u8x16::splat(0x7F); -- !s.gt(highest_ascii).any() -+ !any_mask8x16(s.simd_gt(highest_ascii)) - } - } - } - - cfg_if! { - if #[cfg(target_feature = "sse2")] { - #[inline(always)] - pub fn simd_is_str_latin1(s: u8x16) -> bool { - if simd_is_ascii(s) { - return true; - } - let above_str_latin1 = u8x16::splat(0xC4); -- s.lt(above_str_latin1).all() -+ s.simd_lt(above_str_latin1).all() - } - } else if #[cfg(target_arch = "aarch64")]{ - #[inline(always)] - pub fn simd_is_str_latin1(s: u8x16) -> bool { - unsafe { -- vmaxvq_u8(s.into_bits()) < 0xC4 -+ // Safety: We have cfg()d the correct platform -+ vmaxvq_u8(s.into()) < 0xC4 - } - } - } else { - #[inline(always)] - pub fn simd_is_str_latin1(s: u8x16) -> bool { - let above_str_latin1 = u8x16::splat(0xC4); -- s.lt(above_str_latin1).all() -+ all_mask8x16(s.simd_lt(above_str_latin1)) - } - } - } - - cfg_if! { - if #[cfg(target_arch = "aarch64")]{ - #[inline(always)] - pub fn simd_is_basic_latin(s: u16x8) -> bool { - unsafe { -- vmaxvq_u16(s.into_bits()) < 0x80 -+ // Safety: We have cfg()d the correct platform -+ vmaxvq_u16(s.into()) < 0x80 - } - } - - #[inline(always)] - pub fn simd_is_latin1(s: u16x8) -> bool { - unsafe { -- vmaxvq_u16(s.into_bits()) < 0x100 -+ // Safety: We have cfg()d the correct platform -+ vmaxvq_u16(s.into()) < 0x100 - } - } - } else { - #[inline(always)] - pub fn simd_is_basic_latin(s: u16x8) -> bool { - let above_ascii = u16x8::splat(0x80); -- s.lt(above_ascii).all() -+ all_mask16x8(s.simd_lt(above_ascii)) - } - - #[inline(always)] - pub fn simd_is_latin1(s: u16x8) -> bool { - // For some reason, on SSE2 this formulation - // seems faster in this case while the above - // function is better the other way round... - let highest_latin1 = u16x8::splat(0xFF); -- !s.gt(highest_latin1).any() -+ !any_mask16x8(s.simd_gt(highest_latin1)) - } - } - } - - #[inline(always)] - pub fn contains_surrogates(s: u16x8) -> bool { - let mask = u16x8::splat(0xF800); - let surrogate_bits = u16x8::splat(0xD800); -- (s & mask).eq(surrogate_bits).any() -+ any_mask16x8((s & mask).simd_eq(surrogate_bits)) - } - - cfg_if! { - if #[cfg(target_arch = "aarch64")]{ - macro_rules! aarch64_return_false_if_below_hebrew { - ($s:ident) => ({ - unsafe { -- if vmaxvq_u16($s.into_bits()) < 0x0590 { -+ // Safety: We have cfg()d the correct platform -+ if vmaxvq_u16($s.into()) < 0x0590 { - return false; - } - } - }) - } - - macro_rules! non_aarch64_return_false_if_all { - ($s:ident) => () - } - } else { - macro_rules! aarch64_return_false_if_below_hebrew { - ($s:ident) => () - } - - macro_rules! non_aarch64_return_false_if_all { - ($s:ident) => ({ -- if $s.all() { -+ if all_mask16x8($s) { - return false; - } - }) - } - } - } - - macro_rules! in_range16x8 { - ($s:ident, $start:expr, $end:expr) => {{ - // SIMD sub is wrapping -- ($s - u16x8::splat($start)).lt(u16x8::splat($end - $start)) -+ ($s - u16x8::splat($start)).simd_lt(u16x8::splat($end - $start)) - }}; - } - - #[inline(always)] - pub fn is_u16x8_bidi(s: u16x8) -> bool { - // We try to first quickly refute the RTLness of the vector. If that - // fails, we do the real RTL check, so in that case we end up wasting - // the work for the up-front quick checks. Even the quick-check is - // two-fold in order to return `false` ASAP if everything is below - // Hebrew. - - aarch64_return_false_if_below_hebrew!(s); - -- let below_hebrew = s.lt(u16x8::splat(0x0590)); -+ let below_hebrew = s.simd_lt(u16x8::splat(0x0590)); - - non_aarch64_return_false_if_all!(below_hebrew); - -- if (below_hebrew | in_range16x8!(s, 0x0900, 0x200F) | in_range16x8!(s, 0x2068, 0xD802)).all() { -+ if all_mask16x8( -+ below_hebrew | in_range16x8!(s, 0x0900, 0x200F) | in_range16x8!(s, 0x2068, 0xD802), -+ ) { - return false; - } - - // Quick refutation failed. Let's do the full check. - -- (in_range16x8!(s, 0x0590, 0x0900) -- | in_range16x8!(s, 0xFB1D, 0xFE00) -- | in_range16x8!(s, 0xFE70, 0xFEFF) -- | in_range16x8!(s, 0xD802, 0xD804) -- | in_range16x8!(s, 0xD83A, 0xD83C) -- | s.eq(u16x8::splat(0x200F)) -- | s.eq(u16x8::splat(0x202B)) -- | s.eq(u16x8::splat(0x202E)) -- | s.eq(u16x8::splat(0x2067))) -- .any() -+ any_mask16x8( -+ (in_range16x8!(s, 0x0590, 0x0900) -+ | in_range16x8!(s, 0xFB1D, 0xFE00) -+ | in_range16x8!(s, 0xFE70, 0xFEFF) -+ | in_range16x8!(s, 0xD802, 0xD804) -+ | in_range16x8!(s, 0xD83A, 0xD83C) -+ | s.simd_eq(u16x8::splat(0x200F)) -+ | s.simd_eq(u16x8::splat(0x202B)) -+ | s.simd_eq(u16x8::splat(0x202E)) -+ | s.simd_eq(u16x8::splat(0x2067))), -+ ) - } - - #[inline(always)] - pub fn simd_unpack(s: u8x16) -> (u16x8, u16x8) { -- unsafe { -- let first: u8x16 = shuffle!( -- s, -- u8x16::splat(0), -- [0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23] -- ); -- let second: u8x16 = shuffle!( -- s, -- u8x16::splat(0), -- [8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31] -- ); -- (first.into_bits(), second.into_bits()) -- } -+ let first: u8x16 = simd_swizzle!( -+ s, -+ u8x16::splat(0), -+ [0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23] -+ ); -+ let second: u8x16 = simd_swizzle!( -+ s, -+ u8x16::splat(0), -+ [8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31] -+ ); -+ (u16x8::from_ne_bytes(first), u16x8::from_ne_bytes(second)) - } - - cfg_if! { - if #[cfg(target_feature = "sse2")] { - #[inline(always)] - pub fn simd_pack(a: u16x8, b: u16x8) -> u8x16 { - unsafe { -- _mm_packus_epi16(a.into_bits(), b.into_bits()).into_bits() -+ // Safety: We have cfg()d the correct platform -+ _mm_packus_epi16(a.into(), b.into()).into() - } - } - } else { - #[inline(always)] - pub fn simd_pack(a: u16x8, b: u16x8) -> u8x16 { -- unsafe { -- let first: u8x16 = a.into_bits(); -- let second: u8x16 = b.into_bits(); -- shuffle!( -- first, -- second, -- [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30] -- ) -- } -+ let first: u8x16 = a.to_ne_bytes(); -+ let second: u8x16 = b.to_ne_bytes(); -+ simd_swizzle!( -+ first, -+ second, -+ [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30] -+ ) - } - } - } - - #[cfg(test)] - mod tests { - use super::*; - use alloc::vec::Vec; -diff --git a/third_party/rust/encoding_rs/src/single_byte.rs b/third_party/rust/encoding_rs/src/single_byte.rs ---- a/third_party/rust/encoding_rs/src/single_byte.rs -+++ b/third_party/rust/encoding_rs/src/single_byte.rs -@@ -48,16 +48,19 @@ impl SingleByteDecoder { - CopyAsciiResult::GoOn((mut non_ascii, mut handle)) => 'middle: loop { - // Start non-boilerplate - // - // Since the non-ASCIIness of `non_ascii` is hidden from - // the optimizer, it can't figure out that it's OK to - // statically omit the bound check when accessing - // `[u16; 128]` with an index - // `non_ascii as usize - 0x80usize`. -+ // -+ // Safety: `non_ascii` is a u8 byte >=0x80, from the invariants -+ // on Utf8Destination::copy_ascii_from_check_space_bmp() - let mapped = - unsafe { *(self.table.get_unchecked(non_ascii as usize - 0x80usize)) }; - // let mapped = self.table[non_ascii as usize - 0x80usize]; - if mapped == 0u16 { - return ( - DecoderResult::Malformed(1, 0), - source.consumed(), - handle.written(), -@@ -146,82 +149,103 @@ impl SingleByteDecoder { - dst: &mut [u16], - _last: bool, - ) -> (DecoderResult, usize, usize) { - let (pending, length) = if dst.len() < src.len() { - (DecoderResult::OutputFull, dst.len()) - } else { - (DecoderResult::InputEmpty, src.len()) - }; -+ // Safety invariant: converted <= length. Quite often we have `converted < length` -+ // which will be separately marked. - let mut converted = 0usize; - 'outermost: loop { - match unsafe { -+ // Safety: length is the minimum length, `src/dst + x` will always be valid for reads/writes of `len - x` - ascii_to_basic_latin( - src.as_ptr().add(converted), - dst.as_mut_ptr().add(converted), - length - converted, - ) - } { - None => { - return (pending, length, length); - } - Some((mut non_ascii, consumed)) => { -+ // Safety invariant: `converted <= length` upheld, since this can only consume -+ // up to `length - converted` bytes. -+ // -+ // Furthermore, in this context, -+ // we can assume `converted < length` since this branch is only ever hit when -+ // ascii_to_basic_latin fails to consume the entire slice - converted += consumed; - 'middle: loop { - // `converted` doesn't count the reading of `non_ascii` yet. - // Since the non-ASCIIness of `non_ascii` is hidden from - // the optimizer, it can't figure out that it's OK to - // statically omit the bound check when accessing - // `[u16; 128]` with an index - // `non_ascii as usize - 0x80usize`. -+ // -+ // Safety: We can rely on `non_ascii` being between `0x80` and `0xFF` due to -+ // the invariants of `ascii_to_basic_latin()`, and our table has enough space for that. - let mapped = - unsafe { *(self.table.get_unchecked(non_ascii as usize - 0x80usize)) }; - // let mapped = self.table[non_ascii as usize - 0x80usize]; - if mapped == 0u16 { - return ( - DecoderResult::Malformed(1, 0), - converted + 1, // +1 `for non_ascii` - converted, - ); - } - unsafe { -- // The bound check has already been performed -+ // Safety: As mentioned above, `converted < length` - *(dst.get_unchecked_mut(converted)) = mapped; - } -+ // Safety: `converted <= length` upheld, since `converted < length` before this - converted += 1; - // Next, handle ASCII punctuation and non-ASCII without - // going back to ASCII acceleration. Non-ASCII scripts - // use ASCII punctuation, so this avoid going to - // acceleration just for punctuation/space and then - // failing. This is a significant boost to non-ASCII - // scripts. - // TODO: Split out Latin converters without this part - // this stuff makes Latin script-conversion slower. - if converted == length { - return (pending, length, length); - } -+ // Safety: We are back to `converted < length` because of the == above -+ // and can perform this check. - let mut b = unsafe { *(src.get_unchecked(converted)) }; -+ // Safety: `converted < length` is upheld for this loop - 'innermost: loop { - if b > 127 { - non_ascii = b; - continue 'middle; - } - // Testing on Haswell says that we should write the - // byte unconditionally instead of trying to unread it - // to make it part of the next SIMD stride. - unsafe { -+ // Safety: `converted < length` is true for this loop - *(dst.get_unchecked_mut(converted)) = u16::from(b); - } -+ // Safety: We are now at `converted <= length`. We should *not* `continue` -+ // the loop without reverifying - converted += 1; - if b < 60 { - // We've got punctuation - if converted == length { - return (pending, length, length); - } -+ // Safety: we're back to `converted <= length` because of the == above - b = unsafe { *(src.get_unchecked(converted)) }; -+ // Safety: The loop continues as `converted < length` - continue 'innermost; - } - // We've got markup or ASCII text - continue 'outermost; - } - } - } - } -@@ -229,16 +253,18 @@ impl SingleByteDecoder { - } - - pub fn latin1_byte_compatible_up_to(&self, buffer: &[u8]) -> usize { - let mut bytes = buffer; - let mut total = 0; - loop { - if let Some((non_ascii, offset)) = validate_ascii(bytes) { - total += offset; -+ // Safety: We can rely on `non_ascii` being between `0x80` and `0xFF` due to -+ // the invariants of `ascii_to_basic_latin()`, and our table has enough space for that. - let mapped = unsafe { *(self.table.get_unchecked(non_ascii as usize - 0x80usize)) }; - if mapped != u16::from(non_ascii) { - return total; - } - total += 1; - bytes = &bytes[offset + 1..]; - } else { - return total; -@@ -379,64 +405,89 @@ impl SingleByteEncoder { - dst: &mut [u8], - _last: bool, - ) -> (EncoderResult, usize, usize) { - let (pending, length) = if dst.len() < src.len() { - (EncoderResult::OutputFull, dst.len()) - } else { - (EncoderResult::InputEmpty, src.len()) - }; -+ // Safety invariant: converted <= length. Quite often we have `converted < length` -+ // which will be separately marked. - let mut converted = 0usize; - 'outermost: loop { - match unsafe { -+ // Safety: length is the minimum length, `src/dst + x` will always be valid for reads/writes of `len - x` - basic_latin_to_ascii( - src.as_ptr().add(converted), - dst.as_mut_ptr().add(converted), - length - converted, - ) - } { - None => { - return (pending, length, length); - } - Some((mut non_ascii, consumed)) => { -+ // Safety invariant: `converted <= length` upheld, since this can only consume -+ // up to `length - converted` bytes. -+ // -+ // Furthermore, in this context, -+ // we can assume `converted < length` since this branch is only ever hit when -+ // ascii_to_basic_latin fails to consume the entire slice - converted += consumed; - 'middle: loop { - // `converted` doesn't count the reading of `non_ascii` yet. - match self.encode_u16(non_ascii) { - Some(byte) => { - unsafe { -+ // Safety: we're allowed this access since `converted < length` - *(dst.get_unchecked_mut(converted)) = byte; - } - converted += 1; -+ // `converted <= length` now - } - None => { - // At this point, we need to know if we - // have a surrogate. - let high_bits = non_ascii & 0xFC00u16; - if high_bits == 0xD800u16 { - // high surrogate - if converted + 1 == length { - // End of buffer. This surrogate is unpaired. - return ( - EncoderResult::Unmappable('\u{FFFD}'), - converted + 1, // +1 `for non_ascii` - converted, - ); - } -+ // Safety: convered < length from outside the match, and `converted + 1 != length`, -+ // So `converted + 1 < length` as well. We're in bounds - let second = - u32::from(unsafe { *src.get_unchecked(converted + 1) }); - if second & 0xFC00u32 != 0xDC00u32 { - return ( - EncoderResult::Unmappable('\u{FFFD}'), - converted + 1, // +1 `for non_ascii` - converted, - ); - } - // The next code unit is a low surrogate. - let astral: char = unsafe { -+ // Safety: We can rely on non_ascii being 0xD800-0xDBFF since the high bits are 0xD800 -+ // Then, (non_ascii << 10 - 0xD800 << 10) becomes between (0 to 0x3FF) << 10, which is between -+ // 0x400 to 0xffc00. Adding the 0x10000 gives a range of 0x10400 to 0x10fc00. Subtracting the 0xDC00 -+ // gives 0x2800 to 0x102000 -+ // The second term is between 0xDC00 and 0xDFFF from the check above. This gives a maximum -+ // possible range of (0x10400 + 0xDC00) to (0x102000 + 0xDFFF) which is 0x1E000 to 0x10ffff. -+ // This is in range. -+ // -+ // From a Unicode principles perspective this can also be verified as we have checked that `non_ascii` is a high surrogate -+ // (0xD800..=0xDBFF), and that `second` is a low surrogate (`0xDC00..=0xDFFF`), and we are applying reverse of the UTC16 transformation -+ // algorithm , by applying the high surrogate - 0xD800 to the -+ // high ten bits, and the low surrogate - 0xDc00 to the low ten bits, and then adding 0x10000 - ::core::char::from_u32_unchecked( - (u32::from(non_ascii) << 10) + second - - (((0xD800u32 << 10) - 0x1_0000u32) + 0xDC00u32), - ) - }; - return ( - EncoderResult::Unmappable(astral), - converted + 2, // +2 `for non_ascii` and `second` -@@ -451,52 +502,63 @@ impl SingleByteEncoder { - converted, - ); - } - return ( - EncoderResult::unmappable_from_bmp(non_ascii), - converted + 1, // +1 `for non_ascii` - converted, - ); -+ // Safety: This branch diverges, so no need to uphold invariants on `converted` - } - } - // Next, handle ASCII punctuation and non-ASCII without - // going back to ASCII acceleration. Non-ASCII scripts - // use ASCII punctuation, so this avoid going to - // acceleration just for punctuation/space and then - // failing. This is a significant boost to non-ASCII - // scripts. - // TODO: Split out Latin converters without this part - // this stuff makes Latin script-conversion slower. - if converted == length { - return (pending, length, length); - } -+ // Safety: we're back to `converted < length` due to the == above and can perform -+ // the unchecked read - let mut unit = unsafe { *(src.get_unchecked(converted)) }; - 'innermost: loop { -+ // Safety: This loop always begins with `converted < length`, see -+ // the invariant outside and the comment on the continue below - if unit > 127 { - non_ascii = unit; - continue 'middle; - } - // Testing on Haswell says that we should write the - // byte unconditionally instead of trying to unread it - // to make it part of the next SIMD stride. - unsafe { -+ // Safety: Can rely on converted < length - *(dst.get_unchecked_mut(converted)) = unit as u8; - } - converted += 1; -+ // `converted <= length` here - if unit < 60 { - // We've got punctuation - if converted == length { - return (pending, length, length); - } -+ // Safety: `converted < length` due to the == above. The read is safe. - unit = unsafe { *(src.get_unchecked(converted)) }; -+ // Safety: This only happens if `converted < length`, maintaining it - continue 'innermost; - } - // We've got markup or ASCII text - continue 'outermost; -+ // Safety: All other routes to here diverge so the continue is the only -+ // way to run the innermost loop. - } - } - } - } - } - } - } - -diff --git a/third_party/rust/encoding_rs/src/x_user_defined.rs b/third_party/rust/encoding_rs/src/x_user_defined.rs ---- a/third_party/rust/encoding_rs/src/x_user_defined.rs -+++ b/third_party/rust/encoding_rs/src/x_user_defined.rs -@@ -9,22 +9,23 @@ - - use super::*; - use crate::handles::*; - use crate::variant::*; - - cfg_if! { - if #[cfg(feature = "simd-accel")] { - use simd_funcs::*; -- use packed_simd::u16x8; -+ use core::simd::u16x8; -+ use core::simd::cmp::SimdPartialOrd; - - #[inline(always)] - fn shift_upper(unpacked: u16x8) -> u16x8 { - let highest_ascii = u16x8::splat(0x7F); -- unpacked + unpacked.gt(highest_ascii).select(u16x8::splat(0xF700), u16x8::splat(0)) } -+ unpacked + unpacked.simd_gt(highest_ascii).select(u16x8::splat(0xF700), u16x8::splat(0)) } - } else { - } - } - - pub struct UserDefinedDecoder; - - impl UserDefinedDecoder { - pub fn new() -> VariantDecoder { -@@ -111,20 +112,25 @@ impl UserDefinedDecoder { - } else { - (DecoderResult::InputEmpty, src.len()) - }; - // Not bothering with alignment - let tail_start = length & !0xF; - let simd_iterations = length >> 4; - let src_ptr = src.as_ptr(); - let dst_ptr = dst.as_mut_ptr(); -+ // Safety: This is `for i in 0..length / 16` - for i in 0..simd_iterations { -+ // Safety: This is in bounds: length is the minumum valid length for both src/dst -+ // and i ranges to length/16, so multiplying by 16 will always be `< length` and can do -+ // a 16 byte read - let input = unsafe { load16_unaligned(src_ptr.add(i * 16)) }; - let (first, second) = simd_unpack(input); - unsafe { -+ // Safety: same as above, but this is two consecutive 8-byte reads - store8_unaligned(dst_ptr.add(i * 16), shift_upper(first)); - store8_unaligned(dst_ptr.add((i * 16) + 8), shift_upper(second)); - } - } - let src_tail = &src[tail_start..length]; - let dst_tail = &mut dst[tail_start..length]; - src_tail - .iter() - -diff --git a/third_party/rust/encoding_rs/.cargo-checksum.json b/third_party/rust/encoding_rs/.cargo-checksum.json ---- a/third_party/rust/encoding_rs/.cargo-checksum.json -+++ b/third_party/rust/encoding_rs/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"CONTRIBUTING.md":"ca1901f3e8532fb4cec894fd3664f0eaa898c0c4b961d1b992d1ed54eacf362a","COPYRIGHT":"11789f45bb180841cd362a5eee6789c68ddb573a11105e30768c308a6add0190","Cargo.toml":"42fa83322aa9fd6723b77d35d0cacb92cbb6e7f573ce11c55f5225292866f8f4","Ideas.md":"b7452893f500163868d8de52c09addaf91e1632454ed02e892c467ed7ec39dbd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","LICENSE-WHATWG":"838118388fe5c2e7f1dbbaeed13e1c7f3ebf88be91319c7c1d77c18e987d1a50","README.md":"d938e8ab0b9ab67e74a1a4f48f23fdce956d0ad3a3f6147ae7612a92763c88d5","ci/miri.sh":"43cb8d82f49e3bfe2d2274b6ccd6f0714a4188ccef0cecc040829883cfdbee25","doc/Big5.txt":"f73a2edc5cb6c2d140ba6e07f4542e1c4a234950378acde1df93480f0ca0be0b","doc/EUC-JP.txt":"ee2818b907d0137f40a9ab9fd525fc700a44dbdddb6cf0c157a656566bae4bf1","doc/EUC-KR.txt":"71d9e2ccf3b124e8bdfb433c8cf2773fd878077038d0cec3c7237a50f4a78a30","doc/GBK.txt":"c1b522b5a799884e5001da661f42c5a8f4d0acb9ef1d74b206f22b5f65365606","doc/IBM866.txt":"a5a433e804d0f83af785015179fbc1d9b0eaf1f7960efcd04093e136b51fbd0e","doc/ISO-2022-JP.txt":"af86684f5a8f0e2868d7b2c292860140c3d2e5527530ca091f1b28198e8e2fe6","doc/ISO-8859-10.txt":"6d3949ad7c81ca176895101ed81a1db7df1060d64e262880b94bd31bb344ab4d","doc/ISO-8859-13.txt":"3951dd89cf93f7729148091683cf8511f4529388b7dc8dcd0d62eaed55be93fa","doc/ISO-8859-14.txt":"3d330784a0374fd255a38b47949675cc7168c800530534b0a01cac6edc623adc","doc/ISO-8859-15.txt":"24b1084aab5127a85aab99153f86e24694d0a3615f53b5ce23683f97cf66c47a","doc/ISO-8859-16.txt":"ce0272559b92ba76d7a7e476f6424ae4a5cc72e75b183611b08392e44add4d25","doc/ISO-8859-2.txt":"18ceff88c13d1b5ba455a3919b1e3de489045c4c3d2dd7e8527c125c75d54aad","doc/ISO-8859-3.txt":"21798404c68f4f5db59223362f24999da96968c0628427321fccce7d2849a130","doc/ISO-8859-4.txt":"d27f6520c6c5bfbcc19176b71d081cdb3bccde1622bb3e420d5680e812632d53","doc/ISO-8859-5.txt":"a10ec8d6ea7a78ad15da7275f6cb1a3365118527e28f9af6d0d5830501303f3a","doc/ISO-8859-6.txt":"ccda8a2efc96115336bdd77776637b9712425e44fbcf745353b9057fbef144e7","doc/ISO-8859-7.txt":"17900fa1f27a445958f0a77d7d9056be375a6bd7ee4492aa680c7c1500bab85e","doc/ISO-8859-8-I.txt":"8357555646d54265a9b9ffa3e68b08d132312f1561c60108ff9b8b1167b6ecf2","doc/ISO-8859-8.txt":"72cd6f3afb7b4a9c16a66a362473315770b7755d72c86c870e52fc3eba86c8af","doc/KOI8-R.txt":"839cf19a38da994488004ed7814b1f6151640156a9a2af02bf2efca745fb5966","doc/KOI8-U.txt":"0cc76624ed1f024183e2298b7e019957da2c70c8ca06e0fc4e6f353f50a5054f","doc/Shift_JIS.txt":"34c49141818cb9ddbcf59cc858f78a79be8ad148d563f26415108ae1f148443f","doc/UTF-16BE.txt":"e2e280d8acbaa6d2a6b3569d60e17500a285f2baa0df3363dd85537cd5a1ef8f","doc/UTF-16LE.txt":"70bdc170e3fc5298ba68f10125fb5eeb8b077036cc96bb4416c4de396f6d76c1","doc/UTF-8.txt":"ea7bae742e613010ced002cf4b601a737d2203fad65e115611451bc4428f548a","doc/gb18030.txt":"dc71378a8f07a2d8659f69ee81fb8791fef56ba86f124b429978285237bb4a7b","doc/macintosh.txt":"57491e53866711b4672d9b9ff35380b9dac9e0d8e3d6c20bdd6140603687c023","doc/replacement.txt":"4b6c3bbd7999d9d4108a281594bd02d13607e334a95465afff8c2c08d395f0e4","doc/windows-1250.txt":"61296bb6a21cdab602300d32ecfba434cb82de5ac3bc88d58710d2f125e28d39","doc/windows-1251.txt":"7deea1c61dea1485c8ff02db2c7d578db7a9aab63ab1cfd02ec04b515864689e","doc/windows-1252.txt":"933ef3bdddfce5ee132b9f1a1aa8b47423d2587bbe475b19028d0a6d38e180b6","doc/windows-1253.txt":"1a38748b88e99071a5c7b3d5456ead4caedeabab50d50d658be105bc113714de","doc/windows-1254.txt":"f8372f86c6f8d642563cd6ddc025260553292a39423df1683a98670bd7bf2b47","doc/windows-1255.txt":"4e5852494730054e2da258a74e1b9d780abbcdd8ce22ebc218ca2efe9e90493d","doc/windows-1256.txt":"c0879c5172abedead302a406e8f60d9cd9598694a0ffa4fd288ffe4fef7b8ea1","doc/windows-1257.txt":"c28a0c9f964fcb2b46d21f537c402446501a2800670481d6abf9fd9e9018d523","doc/windows-1258.txt":"5019ae4d61805c79aacbf17c93793342dbb098d65a1837783bc3e2c6d6a23602","doc/windows-874.txt":"4ef0e4501c5feba8b17aee1818602ed44b36ca8475db771ce2fc16d392cabecc","doc/x-mac-cyrillic.txt":"58be154d8a888ca3d484b83b44f749823ef339ab27f14d90ca9a856f5050a8bd","doc/x-user-defined.txt":"f9cd07c4321bf5cfb0be4bdddd251072999b04a6cf7a6f5bc63709a84e2c1ffc","generate-encoding-data.py":"be989dd25c6b946e3e8745fdc8e8a80fcf24b3be99ad0b4b78153ba3f6ab6310","rustfmt.toml":"85c1a3b4382fd89e991cbb81b70fb52780472edc064c963943cdaaa56e0a2030","src/ascii.rs":"c44c002641adb5ebc4368707a8cc0a076d2f33e6a5c27b1b69988eb515f5653d","src/big5.rs":"ec6e2913011a38e9a3e825a1731f139a7ca1d5b264fefae51a3cc1a68a57cef9","src/data.rs":"8a617cc57032092d65850eb27e00de687c80aea3299e839a1f58b42d0b35abf3","src/euc_jp.rs":"32047f5b540188c4cb19c07165f846b9786a09f18e315ed3e9bda1293dae52aa","src/euc_kr.rs":"9b25afc72d9378700eecfac58d55ad1c5946d6cd0ccde2c29c08200ef2de6bb9","src/gb18030.rs":"808587168d73f0c80f8520f0ca9b161866ed2efeb17a05e85fdf3b8efe7ba28a","src/handles.rs":"cc83dc0754751d67f5688a65c5e0191cba02f6bacce81a0813a243cba55eef7a","src/iso_2022_jp.rs":"9bb485e82574f4b7d4b2364f0ff276acb6a0bc111758420a3b0ec5e04c196652","src/lib.rs":"1dc07b818e45846b16ddcaf0de46c8862dd7df8099123ec38b95c3f8ad9c91ec","src/macros.rs":"200997f8870de8bfd8cdc475e92115df42108c0df661e49d3d1cbc32056e1d99","src/mem.rs":"0bf34103e0ad1b842a13a082dee2b920b05cf4fb0f145c9ee7f608f4cb4a544f","src/replacement.rs":"7660b34a53f8c1ca2bdfa0e51e843ec28326950952ad8bc96569feb93ac62308","src/shift_jis.rs":"6951ae67e36b1a12fa3a30734957f444d8b1b4ae0e2bde52060b29bd0f16d9d9","src/simd_funcs.rs":"2612aba86e1d201096d7e47a859bc3444f85934cc82d8adc6d39a4304d9eecfc","src/single_byte.rs":"3c9e9c1f946ae622c725ba9421240c1faa9a05e95fa10dd4642a25cb276a1edc","src/test_data/big5_in.txt":"4c5a8691f8dc717311889c63894026d2fb62725a86c4208ca274a9cc8d42a503","src/test_data/big5_in_ref.txt":"99d399e17750cf9c7cf30bb253dbfe35b81c4fcbdead93cfa48b1429213473c7","src/test_data/big5_out.txt":"6193ca97c297aa20e09396038d18e938bb7ea331c26f0f2454097296723a0b13","src/test_data/big5_out_ref.txt":"36567691f557df144f6cc520015a87038dfa156f296fcf103b56ae9a718be1fc","src/test_data/euc_kr_in.txt":"c86a7224f3215fa0d04e685622a752fdc72763e8ae076230c7fd62de57ec4074","src/test_data/euc_kr_in_ref.txt":"1f419f4ca47d708b54c73c461545a022ae2e20498fdbf8005a483d752a204883","src/test_data/euc_kr_out.txt":"e7f32e026f70be1e1b58e0047baf7d3d2c520269c4f9b9992e158b4decb0a1a3","src/test_data/euc_kr_out_ref.txt":"c9907857980b20b8e9e3b584482ed6567a2be6185d72237b6322f0404944924e","src/test_data/gb18030_in.txt":"ab7231b2d3e9afacdbd7d7f3b9e5361a7ff9f7e1cfdb4f3bd905b9362b309e53","src/test_data/gb18030_in_ref.txt":"dc5069421adca2043c55f5012b55a76fdff651d22e6e699fd0978f8d5706815c","src/test_data/gb18030_out.txt":"f0208d527f5ca63de7d9a0323be8d5cf12d8a104b2943d92c2701f0c3364dac1","src/test_data/gb18030_out_ref.txt":"6819fe47627e4ea01027003fc514b9f21a1322e732d7f1fb92cc6c5455bc6c07","src/test_data/iso_2022_jp_in.txt":"cd24bbdcb1834e25db54646fbf4c41560a13dc7540f6be3dba4f5d97d44513af","src/test_data/iso_2022_jp_in_ref.txt":"3dc4e6a5e06471942d086b16c9440945e78415f6f3f47e43717e4bc2eac2cdf5","src/test_data/iso_2022_jp_out.txt":"9b6f015329dda6c3f9ee5ce6dbd6fa9c89acc21283e886836c78b8d833480c21","src/test_data/iso_2022_jp_out_ref.txt":"78cb260093a20116ad9a42f43b05d1848c5ab100b6b9a850749809e943884b35","src/test_data/jis0208_in.txt":"6df3030553ffb0a6615bb33dc8ea9dca6d9623a9028e2ffec754ce3c3da824cc","src/test_data/jis0208_in_ref.txt":"3dc4e6a5e06471942d086b16c9440945e78415f6f3f47e43717e4bc2eac2cdf5","src/test_data/jis0208_out.txt":"4ec24477e1675ce750733bdc3c5add1cd27b6bd4ce1f09289564646e9654e857","src/test_data/jis0208_out_ref.txt":"c3e1cef5032b2b1d93a406f31ff940c4e2dfe8859b8b17ca2761fee7a75a0e48","src/test_data/jis0212_in.txt":"c011f0dd72bd7c8cd922df9374ef8d2769a77190514c77f6c62b415852eeb9fe","src/test_data/jis0212_in_ref.txt":"7d9458b3d2f73e7092a7f505c08ce1d233dde18aa679fbcf9889256239cc9e06","src/test_data/shift_jis_in.txt":"02e389ccef0dd2122e63f503899402cb7f797912c2444cc80ab93131116c5524","src/test_data/shift_jis_in_ref.txt":"512f985950ca902e643c88682dba9708b7c38d3c5ec2925168ab00ac94ab19f9","src/test_data/shift_jis_out.txt":"5fbc44da7bf639bf6cfe0fa1fd3eba7102b88f81919c9ea991302712f69426fb","src/test_data/shift_jis_out_ref.txt":"466322c6fed8286c64582731755290c2296508efdd258826e6279686649b481f","src/test_labels_names.rs":"23a2e11b02b3b8d15fb5613a625e3edb2c61e70e3c581abfd638719a4088200d","src/testing.rs":"f59e671e95a98a56f6b573e8c6be4d71e670bf52f7e20eb1605d990aafa1894e","src/utf_16.rs":"c071a147fad38d750c2c247e141b76b929a48007b99f26b2922b9caecdaf2f25","src/utf_8.rs":"7b7d887b347f1aefa03246b028a36a72758a4ce76c28f3b45c19467851aa7839","src/variant.rs":"1fab5363588a1554a7169de8731ea9cded7ac63ea35caabdd1c27a8dde68c27b","src/x_user_defined.rs":"c9c010730dfb9f141d4fed19350c08a21af240913a54bb64f5ca89ff93b6b7d1"},"package":"7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"} -\ No newline at end of file -+{"files":{"CONTRIBUTING.md":"ca1901f3e8532fb4cec894fd3664f0eaa898c0c4b961d1b992d1ed54eacf362a","COPYRIGHT":"11789f45bb180841cd362a5eee6789c68ddb573a11105e30768c308a6add0190","Cargo.toml":"22a4d210c92dae9f32c6944ef340ee8fdd027f99c081577e8907123e2a93383e","Ideas.md":"b7452893f500163868d8de52c09addaf91e1632454ed02e892c467ed7ec39dbd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","LICENSE-WHATWG":"838118388fe5c2e7f1dbbaeed13e1c7f3ebf88be91319c7c1d77c18e987d1a50","README.md":"1d08aefcb92afa81b18154049c9abbcad4540a23f7172e9f9bbed5af33f1a087","ci/miri.sh":"43cb8d82f49e3bfe2d2274b6ccd6f0714a4188ccef0cecc040829883cfdbee25","doc/Big5.txt":"f73a2edc5cb6c2d140ba6e07f4542e1c4a234950378acde1df93480f0ca0be0b","doc/EUC-JP.txt":"ee2818b907d0137f40a9ab9fd525fc700a44dbdddb6cf0c157a656566bae4bf1","doc/EUC-KR.txt":"71d9e2ccf3b124e8bdfb433c8cf2773fd878077038d0cec3c7237a50f4a78a30","doc/GBK.txt":"c1b522b5a799884e5001da661f42c5a8f4d0acb9ef1d74b206f22b5f65365606","doc/IBM866.txt":"a5a433e804d0f83af785015179fbc1d9b0eaf1f7960efcd04093e136b51fbd0e","doc/ISO-2022-JP.txt":"af86684f5a8f0e2868d7b2c292860140c3d2e5527530ca091f1b28198e8e2fe6","doc/ISO-8859-10.txt":"6d3949ad7c81ca176895101ed81a1db7df1060d64e262880b94bd31bb344ab4d","doc/ISO-8859-13.txt":"3951dd89cf93f7729148091683cf8511f4529388b7dc8dcd0d62eaed55be93fa","doc/ISO-8859-14.txt":"3d330784a0374fd255a38b47949675cc7168c800530534b0a01cac6edc623adc","doc/ISO-8859-15.txt":"24b1084aab5127a85aab99153f86e24694d0a3615f53b5ce23683f97cf66c47a","doc/ISO-8859-16.txt":"ce0272559b92ba76d7a7e476f6424ae4a5cc72e75b183611b08392e44add4d25","doc/ISO-8859-2.txt":"18ceff88c13d1b5ba455a3919b1e3de489045c4c3d2dd7e8527c125c75d54aad","doc/ISO-8859-3.txt":"21798404c68f4f5db59223362f24999da96968c0628427321fccce7d2849a130","doc/ISO-8859-4.txt":"d27f6520c6c5bfbcc19176b71d081cdb3bccde1622bb3e420d5680e812632d53","doc/ISO-8859-5.txt":"a10ec8d6ea7a78ad15da7275f6cb1a3365118527e28f9af6d0d5830501303f3a","doc/ISO-8859-6.txt":"ccda8a2efc96115336bdd77776637b9712425e44fbcf745353b9057fbef144e7","doc/ISO-8859-7.txt":"17900fa1f27a445958f0a77d7d9056be375a6bd7ee4492aa680c7c1500bab85e","doc/ISO-8859-8-I.txt":"8357555646d54265a9b9ffa3e68b08d132312f1561c60108ff9b8b1167b6ecf2","doc/ISO-8859-8.txt":"72cd6f3afb7b4a9c16a66a362473315770b7755d72c86c870e52fc3eba86c8af","doc/KOI8-R.txt":"839cf19a38da994488004ed7814b1f6151640156a9a2af02bf2efca745fb5966","doc/KOI8-U.txt":"0cc76624ed1f024183e2298b7e019957da2c70c8ca06e0fc4e6f353f50a5054f","doc/Shift_JIS.txt":"34c49141818cb9ddbcf59cc858f78a79be8ad148d563f26415108ae1f148443f","doc/UTF-16BE.txt":"e2e280d8acbaa6d2a6b3569d60e17500a285f2baa0df3363dd85537cd5a1ef8f","doc/UTF-16LE.txt":"70bdc170e3fc5298ba68f10125fb5eeb8b077036cc96bb4416c4de396f6d76c1","doc/UTF-8.txt":"ea7bae742e613010ced002cf4b601a737d2203fad65e115611451bc4428f548a","doc/gb18030.txt":"dc71378a8f07a2d8659f69ee81fb8791fef56ba86f124b429978285237bb4a7b","doc/macintosh.txt":"57491e53866711b4672d9b9ff35380b9dac9e0d8e3d6c20bdd6140603687c023","doc/replacement.txt":"4b6c3bbd7999d9d4108a281594bd02d13607e334a95465afff8c2c08d395f0e4","doc/windows-1250.txt":"61296bb6a21cdab602300d32ecfba434cb82de5ac3bc88d58710d2f125e28d39","doc/windows-1251.txt":"7deea1c61dea1485c8ff02db2c7d578db7a9aab63ab1cfd02ec04b515864689e","doc/windows-1252.txt":"933ef3bdddfce5ee132b9f1a1aa8b47423d2587bbe475b19028d0a6d38e180b6","doc/windows-1253.txt":"1a38748b88e99071a5c7b3d5456ead4caedeabab50d50d658be105bc113714de","doc/windows-1254.txt":"f8372f86c6f8d642563cd6ddc025260553292a39423df1683a98670bd7bf2b47","doc/windows-1255.txt":"4e5852494730054e2da258a74e1b9d780abbcdd8ce22ebc218ca2efe9e90493d","doc/windows-1256.txt":"c0879c5172abedead302a406e8f60d9cd9598694a0ffa4fd288ffe4fef7b8ea1","doc/windows-1257.txt":"c28a0c9f964fcb2b46d21f537c402446501a2800670481d6abf9fd9e9018d523","doc/windows-1258.txt":"5019ae4d61805c79aacbf17c93793342dbb098d65a1837783bc3e2c6d6a23602","doc/windows-874.txt":"4ef0e4501c5feba8b17aee1818602ed44b36ca8475db771ce2fc16d392cabecc","doc/x-mac-cyrillic.txt":"58be154d8a888ca3d484b83b44f749823ef339ab27f14d90ca9a856f5050a8bd","doc/x-user-defined.txt":"f9cd07c4321bf5cfb0be4bdddd251072999b04a6cf7a6f5bc63709a84e2c1ffc","generate-encoding-data.py":"be989dd25c6b946e3e8745fdc8e8a80fcf24b3be99ad0b4b78153ba3f6ab6310","rustfmt.toml":"85c1a3b4382fd89e991cbb81b70fb52780472edc064c963943cdaaa56e0a2030","src/ascii.rs":"588e38b01e666d5e7462617ea7e90a108d608dec9e016f3d273ac0744af2e05d","src/big5.rs":"ec6e2913011a38e9a3e825a1731f139a7ca1d5b264fefae51a3cc1a68a57cef9","src/data.rs":"8a617cc57032092d65850eb27e00de687c80aea3299e839a1f58b42d0b35abf3","src/euc_jp.rs":"32047f5b540188c4cb19c07165f846b9786a09f18e315ed3e9bda1293dae52aa","src/euc_kr.rs":"9b25afc72d9378700eecfac58d55ad1c5946d6cd0ccde2c29c08200ef2de6bb9","src/gb18030.rs":"808587168d73f0c80f8520f0ca9b161866ed2efeb17a05e85fdf3b8efe7ba28a","src/handles.rs":"b08cef1f5785bb6a4822f2e844c6df1b046b737b7a075e4593eaa8c4208e9fe2","src/iso_2022_jp.rs":"9bb485e82574f4b7d4b2364f0ff276acb6a0bc111758420a3b0ec5e04c196652","src/lib.rs":"834f44b670ec48ee82c0e12223d1567313fdd9f88bca5f4b117c82c1828f559f","src/macros.rs":"200997f8870de8bfd8cdc475e92115df42108c0df661e49d3d1cbc32056e1d99","src/mem.rs":"948571137d3b151df8db4fb2c733e74ae595d055cdf0ad83abcab9341d6adabe","src/replacement.rs":"7660b34a53f8c1ca2bdfa0e51e843ec28326950952ad8bc96569feb93ac62308","src/shift_jis.rs":"6951ae67e36b1a12fa3a30734957f444d8b1b4ae0e2bde52060b29bd0f16d9d9","src/simd_funcs.rs":"05c6e77af74bfe73cd39a752067c11425d6b46e5da419910f54bf75a5c02a984","src/single_byte.rs":"3ad87116fb339434a4b58e8f2b15485f2b66b9f7814d708f16194ed08f6d6ccf","src/test_data/big5_in.txt":"4c5a8691f8dc717311889c63894026d2fb62725a86c4208ca274a9cc8d42a503","src/test_data/big5_in_ref.txt":"99d399e17750cf9c7cf30bb253dbfe35b81c4fcbdead93cfa48b1429213473c7","src/test_data/big5_out.txt":"6193ca97c297aa20e09396038d18e938bb7ea331c26f0f2454097296723a0b13","src/test_data/big5_out_ref.txt":"36567691f557df144f6cc520015a87038dfa156f296fcf103b56ae9a718be1fc","src/test_data/euc_kr_in.txt":"c86a7224f3215fa0d04e685622a752fdc72763e8ae076230c7fd62de57ec4074","src/test_data/euc_kr_in_ref.txt":"1f419f4ca47d708b54c73c461545a022ae2e20498fdbf8005a483d752a204883","src/test_data/euc_kr_out.txt":"e7f32e026f70be1e1b58e0047baf7d3d2c520269c4f9b9992e158b4decb0a1a3","src/test_data/euc_kr_out_ref.txt":"c9907857980b20b8e9e3b584482ed6567a2be6185d72237b6322f0404944924e","src/test_data/gb18030_in.txt":"ab7231b2d3e9afacdbd7d7f3b9e5361a7ff9f7e1cfdb4f3bd905b9362b309e53","src/test_data/gb18030_in_ref.txt":"dc5069421adca2043c55f5012b55a76fdff651d22e6e699fd0978f8d5706815c","src/test_data/gb18030_out.txt":"f0208d527f5ca63de7d9a0323be8d5cf12d8a104b2943d92c2701f0c3364dac1","src/test_data/gb18030_out_ref.txt":"6819fe47627e4ea01027003fc514b9f21a1322e732d7f1fb92cc6c5455bc6c07","src/test_data/iso_2022_jp_in.txt":"cd24bbdcb1834e25db54646fbf4c41560a13dc7540f6be3dba4f5d97d44513af","src/test_data/iso_2022_jp_in_ref.txt":"3dc4e6a5e06471942d086b16c9440945e78415f6f3f47e43717e4bc2eac2cdf5","src/test_data/iso_2022_jp_out.txt":"9b6f015329dda6c3f9ee5ce6dbd6fa9c89acc21283e886836c78b8d833480c21","src/test_data/iso_2022_jp_out_ref.txt":"78cb260093a20116ad9a42f43b05d1848c5ab100b6b9a850749809e943884b35","src/test_data/jis0208_in.txt":"6df3030553ffb0a6615bb33dc8ea9dca6d9623a9028e2ffec754ce3c3da824cc","src/test_data/jis0208_in_ref.txt":"3dc4e6a5e06471942d086b16c9440945e78415f6f3f47e43717e4bc2eac2cdf5","src/test_data/jis0208_out.txt":"4ec24477e1675ce750733bdc3c5add1cd27b6bd4ce1f09289564646e9654e857","src/test_data/jis0208_out_ref.txt":"c3e1cef5032b2b1d93a406f31ff940c4e2dfe8859b8b17ca2761fee7a75a0e48","src/test_data/jis0212_in.txt":"c011f0dd72bd7c8cd922df9374ef8d2769a77190514c77f6c62b415852eeb9fe","src/test_data/jis0212_in_ref.txt":"7d9458b3d2f73e7092a7f505c08ce1d233dde18aa679fbcf9889256239cc9e06","src/test_data/shift_jis_in.txt":"02e389ccef0dd2122e63f503899402cb7f797912c2444cc80ab93131116c5524","src/test_data/shift_jis_in_ref.txt":"512f985950ca902e643c88682dba9708b7c38d3c5ec2925168ab00ac94ab19f9","src/test_data/shift_jis_out.txt":"5fbc44da7bf639bf6cfe0fa1fd3eba7102b88f81919c9ea991302712f69426fb","src/test_data/shift_jis_out_ref.txt":"466322c6fed8286c64582731755290c2296508efdd258826e6279686649b481f","src/test_labels_names.rs":"23a2e11b02b3b8d15fb5613a625e3edb2c61e70e3c581abfd638719a4088200d","src/testing.rs":"f59e671e95a98a56f6b573e8c6be4d71e670bf52f7e20eb1605d990aafa1894e","src/utf_16.rs":"c071a147fad38d750c2c247e141b76b929a48007b99f26b2922b9caecdaf2f25","src/utf_8.rs":"7b7d887b347f1aefa03246b028a36a72758a4ce76c28f3b45c19467851aa7839","src/variant.rs":"1fab5363588a1554a7169de8731ea9cded7ac63ea35caabdd1c27a8dde68c27b","src/x_user_defined.rs":"9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae"},"package":"b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"} diff --git a/extra/thunderbird/0034-bgo-936072-update-crates-for-rust-1.78-patch-from-bugs.freebsd.org-bug278989.patch b/extra/thunderbird/0034-bgo-936072-update-crates-for-rust-1.78-patch-from-bugs.freebsd.org-bug278989.patch deleted file mode 100644 index 3cc46a2f5..000000000 --- a/extra/thunderbird/0034-bgo-936072-update-crates-for-rust-1.78-patch-from-bugs.freebsd.org-bug278989.patch +++ /dev/null @@ -1,199 +0,0 @@ -From cd10f3ba0d83f34ca978cc4c7a552b72fdd068aa Mon Sep 17 00:00:00 2001 -From: David Tolnay -Date: Tue, 28 Nov 2023 11:18:39 -0800 -Subject: [PATCH 1/2] Flatten cursor.kind() matching in Item::parse down to one - match - ---- - third_party/rust/bindgen/ir/item.rs | 84 ++++++++++++++++++++++------------------------ - 1 file changed, 41 insertions(+), 43 deletions(-) - -diff --git a/third_party/rust/bindgen/ir/item.rs b/third_party/rust/bindgen/ir/item.rs -index 0556452bfa..4f2d361e51 100644 ---- a/third_party/rust/bindgen/ir/item.rs -+++ b/third_party/rust/bindgen/ir/item.rs -@@ -1427,53 +1427,52 @@ - } - } - -- // Guess how does clang treat extern "C" blocks? -- if cursor.kind() == CXCursor_UnexposedDecl { -- Err(ParseError::Recurse) -- } else { -+ match cursor.kind() { -+ // Guess how does clang treat extern "C" blocks? -+ CXCursor_UnexposedDecl => Err(ParseError::Recurse), -+ - // We allowlist cursors here known to be unhandled, to prevent being - // too noisy about this. -- match cursor.kind() { -- CXCursor_MacroDefinition | -- CXCursor_MacroExpansion | -- CXCursor_UsingDeclaration | -- CXCursor_UsingDirective | -- CXCursor_StaticAssert | -- CXCursor_FunctionTemplate => { -- debug!( -- "Unhandled cursor kind {:?}: {:?}", -- cursor.kind(), -- cursor -- ); -- } -- CXCursor_InclusionDirective => { -- let file = cursor.get_included_file_name(); -- match file { -- None => { -- warn!( -- "Inclusion of a nameless file in {:?}", -- cursor -- ); -- } -- Some(filename) => { -- ctx.include_file(filename); -- } -- } -- } -- _ => { -- // ignore toplevel operator overloads -- let spelling = cursor.spelling(); -- if !spelling.starts_with("operator") { -+ CXCursor_MacroDefinition | -+ CXCursor_MacroExpansion | -+ CXCursor_UsingDeclaration | -+ CXCursor_UsingDirective | -+ CXCursor_StaticAssert | -+ CXCursor_FunctionTemplate => { -+ debug!( -+ "Unhandled cursor kind {:?}: {:?}", -+ cursor.kind(), -+ cursor -+ ); -+ Err(ParseError::Continue) -+ } -+ CXCursor_InclusionDirective => { -+ let file = cursor.get_included_file_name(); -+ match file { -+ None => { - warn!( -- "Unhandled cursor kind {:?}: {:?}", -- cursor.kind(), -+ "Inclusion of a nameless file in {:?}", - cursor - ); - } -+ Some(filename) => { -+ ctx.include_file(filename); -+ } - } -+ Err(ParseError::Continue) -+ } -+ _ => { -+ // ignore toplevel operator overloads -+ let spelling = cursor.spelling(); -+ if !spelling.starts_with("operator") { -+ warn!( -+ "Unhandled cursor kind {:?}: {:?}", -+ cursor.kind(), -+ cursor -+ ); -+ } -+ Err(ParseError::Continue) - } -- -- Err(ParseError::Continue) - } - } - - -From 2997017b5a3065b83e9d76f0080d6cb99c94c0c1 Mon Sep 17 00:00:00 2001 -From: David Tolnay -Date: Tue, 28 Nov 2023 11:21:18 -0800 -Subject: [PATCH 2/2] Handle CXCursor_LinkageSpec in Clang 18+ - ---- - third_party/rust/bindgen/ir/item.rs | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/third_party/rust/bindgen/ir/item.rs b/third_party/rust/bindgen/ir/item.rs -index 4f2d361e51..dd587b088b 100644 ---- a/third_party/rust/bindgen/ir/item.rs -+++ b/third_party/rust/bindgen/ir/item.rs -@@ -1433,8 +1433,11 @@ impl Item { - } - - match cursor.kind() { -- // Guess how does clang treat extern "C" blocks? -- CXCursor_UnexposedDecl => Err(ParseError::Recurse), -+ // On Clang 18+, extern "C" is reported accurately as a LinkageSpec. -+ // Older LLVM treat it as UnexposedDecl. -+ CXCursor_LinkageSpec | CXCursor_UnexposedDecl => { -+ Err(ParseError::Recurse) -+ } - - // We allowlist cursors here known to be unhandled, to prevent being - // too noisy about this. -diff --git a/dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp b/dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp ---- a/dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp -+++ b/dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp -@@ -97,11 +97,11 @@ - uint32_t width_; - uint32_t height_; - uint8_t y_; - uint8_t u_; - uint8_t v_; -- uint32_t timestamp_; -+ uint64_t timestamp_; - } idr_nalu; - }; - #pragma pack(pop) - - #define ENCODED_FRAME_MAGIC 0x004000b8 -diff --git a/dom/media/gtest/TestGMPRemoveAndDelete.cpp b/dom/media/gtest/TestGMPRemoveAndDelete.cpp ---- a/dom/media/gtest/TestGMPRemoveAndDelete.cpp -+++ b/dom/media/gtest/TestGMPRemoveAndDelete.cpp -@@ -359,11 +359,11 @@ - uint32_t width_; - uint32_t height_; - uint8_t y_; - uint8_t u_; - uint8_t v_; -- uint32_t timestamp_; -+ uint64_t timestamp_; - } idr_nalu; - }; - #pragma pack(pop) - - GMPVideoFrame* absFrame; -diff --git a/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h b/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h ---- a/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h -+++ b/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h -@@ -300,11 +300,11 @@ - - struct InputImageData { - int64_t timestamp_us; - }; - // Map rtp time -> input image data -- DataMutex> mInputImageMap; -+ DataMutex> mInputImageMap; - - MediaEventProducer mInitPluginEvent; - MediaEventProducer mReleasePluginEvent; - }; - -diff --git a/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp b/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp ---- a/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp -+++ b/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp -@@ -538,11 +538,11 @@ - return; - } - - webrtc::VideoFrameType ft; - GmpFrameTypeToWebrtcFrameType(aEncodedFrame->FrameType(), &ft); -- uint32_t timestamp = (aEncodedFrame->TimeStamp() * 90ll + 999) / 1000; -+ uint64_t timestamp = (aEncodedFrame->TimeStamp() * 90ll + 999) / 1000; - - GMP_LOG_DEBUG("GMP Encoded: %" PRIu64 ", type %d, len %d", - aEncodedFrame->TimeStamp(), aEncodedFrame->BufferType(), - aEncodedFrame->Size()); - - diff --git a/extra/thunderbird/PKGBUILD b/extra/thunderbird/PKGBUILD index df3abd047..5ad6c1312 100644 --- a/extra/thunderbird/PKGBUILD +++ b/extra/thunderbird/PKGBUILD @@ -13,7 +13,7 @@ highmem=1 pkgbase=thunderbird pkgname=(thunderbird) -pkgver=115.14.0 +pkgver=128.2.0 pkgrel=1 pkgdesc='Standalone mail and news reader from mozilla.org' url='https://www.thunderbird.net/' @@ -65,17 +65,13 @@ makedepends=( gawk perl findutils libotr ) options=(!emptydirs !makeflags !lto) -source=(https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc} +source=(https://archive.mozilla.org/pub/thunderbird/releases/${pkgver}esr/source/thunderbird-${pkgver}esr.source.tar.xz{,.asc} vendor-prefs.js distribution.ini mozconfig.cfg metainfo.patch org.mozilla.Thunderbird.desktop thunderbird-system-icu-74.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601 - 0031-bmo-1873379-fix-libc++-18-ignore-tuple-harder.patch - 0032-bmo-1841919-llvm-18-variable-does-not-need-to-be-mutable.patch - 0033-bmo-1882209-update-crates-for-rust-1.78-stripped-patch-from-bugs.freebsd.org-bug278834.patch - 0034-bgo-936072-update-crates-for-rust-1.78-patch-from-bugs.freebsd.org-bug278989.patch ) validpgpkeys=( 14F26682D0916CDD81E37B6D61B7B526D98F0353 # Mozilla Software Releases @@ -153,7 +149,9 @@ build() { # malloc_usable_size is used in various parts of the codebase CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + CFLAGS="${CFLAGS/-fexceptions/}" CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + CXXFLAGS="${CXXFLAGS/-fexceptions/}" ./mach configure ./mach build @@ -271,7 +269,7 @@ _languages=( 'zh-CN "Chinese (Simplified)"' 'zh-TW "Chinese (Traditional)"' ) -_url=https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/linux-x86_64/xpi +_url=https://archive.mozilla.org/pub/thunderbird/releases/${pkgver}esr/linux-x86_64/xpi for _lang in "${_languages[@]}"; do _locale=${_lang%% *} @@ -292,7 +290,7 @@ for _src in "${source[@]%%::*}"; do esac done -sha512sums=('b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29' +sha512sums=('24af7d705c13a0b49b0f9fa66a4d17ce4e95b65cc60f84f56364dc8fb480fb61b80166872e234a3c1cb843624874757407b2d9f0c5af82ddf2bf86de82571077' 'SKIP' '6918c0de63deeddc6f53b9ba331390556c12e0d649cf54587dfaabb98b32d6a597b63cf02809c7c58b15501720455a724d527375a8fb9d757ccca57460320734' '5cd3ac4c94ef6dcce72fba02bc18b771a2f67906ff795e0e3d71ce7db6d8a41165bd5443908470915bdbdb98dddd9cf3f837c4ba3a36413f55ec570e6efdbb9f' @@ -300,72 +298,68 @@ sha512sums=('b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a8 '7e43b1f25827ddae615ad43fc1e11c6ba439d6c2049477dfe60e00188a70c0a76160c59a97cc01d1fd99c476f261c7cecb57628b5be48874be7cf991c22db290' 'fffeb73e2055408c5598439b0214b3cb3bb4e53dac3090b880a55f64afcbc56ba5d32d1187829a08ef06d592513d158ced1fde2f20e2f01e967b5fbd3b2fafd4' '9897cb0ababc8e1a0001c4e1f70e0b39f5cdb9c08c69e3afd42088dfd001aa1fc6996cd83df0db1fb57ee0a80686c35c8df783108408dbe9191602cddd1e3c65' - '63de65c2d98287dea2db832a870764f621c25bf0c1353d16f8e68e8316e7554d2047b1c7bbb74a6c48de423f6201964491cd89564e5142066b6609a1aed941a7' - '346fc7c2bcdf0708f41529886a542d2cf11a02799ef2a69dddfa2c6449b8bd7309033f3893f78f21c4ea0be3f35741e12b448977c966f2ae5a0087f9e0465864' - '249706b68ce2450e35216b615b24b7640e75dd120d6d866fa8aab03d644fa6c40b5e129740874d96608bd0c187b6f2456d0d4310729d26d4740d1eca753be4fd' - '7bc7969fe03e5cee0ddb844f7917154afdc4a4df8b8af9c8191180a6813faca9f310cf6b689ec358bc45af12fa3ec386cd46cb9feecf9b38557e36552aa0572d' - '584013d7b6eea794448f4764c17de7b989155ca782f602948a2d0f745c4344954daacd35327bcb85f9e9cad99d5b917f748d47a4805cef171d806bd8211aa591' - '2767eef517e451aedfca4b9a8e254f4388afc1c6021cdc301bd56513073688a63ceb7891aa5bb9dd6c83ae2d5f9078e9b832bdf3e761c88e2379076d15baf519' - 'a01c2d85389e7ca86af4bcc73565bca9faea308a77c16457dcb981492433a177761dd20daf3224ee64c7a527408265ae53fdfb2c2a5b4cfa0df8d2325240ca3a' - '58f519048e3a5f19e227ace477df49b64ddd622c9ea31e5e819d4efd6bc9667d74414abd1178d356ebb021d11de14cfcda125a1a5ecfc080073c5bded074cef9' - '09b931dc2469bb3df21cc85db53c00407d10c067b957ea63cfb921b89bbd4157f075b72abf8abec923c7c553f8e0c64c42b6d98d96b1c9bb8b27b53688dc99d3' - '992cf5337f6d6b5761ad7332f11b0bba14eb962bff0c5683ca3f01a064ff13d76361adf177953a9091d48277d59f2263aa4aebedd450ca2b158a692a06e08ab6' - 'ca23e0a7f5df0e167c2cb293e1d5f3e8bf7af55de3233107b73c297c79121c2945da0fe470ea69bc2512de5dd9a967f674cd75945ff603769cc356d3cf3569b7' - '0c15a5a730f9ad8044004b9caa519da63af0312ef34edd818d691f9310c83ee338ead82ced902f340925c21dd29cf47dd19e766bbb9282dc76dc0944f3f707e7' - 'c5fafb40529893b7a84f044fd69b548ef627ff861f63ba3c14411b860471bbdb308b659e033705afde937e99c28e0d80f7a2e456d305a5621662b872e0dc17bd' - '4dc1c483f79e0b0986dbf7b6ef9dfc3e939b7621b0418b9f704d99cbcea18f97dfe3843b4d204f673e62050bbfed2fca84c7545f6baaa6c25d532f21d0c0b0ba' - 'fded4ba16f3275e0063daf590696590dd7bfa2f9e687666df4e351a864808aa890219f7883e8aee53a299ee6231173ec19e834fdb256a45f0871a329f6bbe360' - '63efe71b9ae267b0afdbc8be55e2f66f4b0b86a1eec31df760dcc57ee8e6f11865712bfb5784d4760ec6d75314ac3acae805d105b08c54d0ea619b898da6428a' - 'd6c341b1e7283c756b98e9040dafc4c71743d4d4254b6a6e13664a14b4897058334554975e06905f99d0cb9457fb36234413733eee5059b370ab4652d27e25c4' - 'ecd1d5896a145b925af0d80255172866e163568822bf306864eabd1c577f002fec022ddacf2cc8212f29287aa56a81448557d4e4c619085db5c41b5a87b2b1d4' - 'a64e83decc87c5050e9b3557eda80b33cd076d86f9180d6d33e4068e3aa30c7093f0304a92e4e9c7728809ce62faef1a964053784953f249304483f0df9b7ff2' - 'b8b6130304dcc2e7288d455964ba5a9fe1519e63869482750f71825b5834f9a230e3f314f8b932704607a91f2ce4766005d52a1ca0d686449249faa4b59897a0' - 'ac84f6a4a4e6a7d026b888da9a23660c048da5993b09059c41542bd699ab8e3fc4dd0d5f3e0b2a49013ce965340b00789bbd8883a4c95e792af7ec1a9b53252e' - 'c7dd7d7f92d5e7146f87925e11e61222acf564466ba5fbf9b56761db7f4f5f5d5e91aa40a860d6095f9e484f5e681188a41227559516fdb97ac39966dab0d491' - 'b150c1fbb52ad4f2cbbe0ef5a17898324a8c111a6db7bbaa621af478b7dc8ec9a2dcc0abee50c4e38d377964e8f49e2943b9617e81126ce7a3ae73f4dcd794d2' - '89a656d9adcd98025c846db4e744f1c44e8f055afe30ae19af32d515133a00e6986b1718eedf0e58cf2c8e116ebb615bd11c9773eaf0e9cc0ad71da54df7aff9' - '5c2658f35998147d1e059cee9dde2b239be116ee9805621ad01056c13e39c57c8f23f30e02406d071857c34e19df2e3a313be609bf69c616c1d4a935987cf9af' - '6e8d1384030b8c45ae6222faef3949b0502d660c2a61bb1951af8dc800fadd663ad588f789836587240947a909d4abe331b059f9b680307e76520237543ae3c0' - '269ace04c16c40d65c44dabe11192756574efd4989f854496d7b0bfabadcfddd14e5fbd051303a63c54eca6622dceaa63df7418bd1b3ee37e06553a7ed1ba942' - '5db9010df40ead2755786f35fef01c710827733523135fa131bb6982aec65fec6d33ccb1ec3bb02ad2e8f6d408a4f690442fb80a4dd3b9630c8efee0cb32335d' - '0d3075c4c90bc9c0473f79aea4a83b6e2b58fba18b5d5821c459803020955a3ea44114b96f897410ea51cbc5d9cf5fa006a7c8c34c29ad0caaf0aa0a0316f3f9' - '1386e78162fba0e7476619038a2b729142967faef8c8767d53fe2c94446719e90db49416f2ec56fa6d9053d52a89a9493d15a9298bb1acc29b3bf4a36731632d' - '71892ecde40003ebca1974336a08c63965083c98d18012effc1bc8912cca855c7b02c57f86a1f947e01e6d1f1a993d9586f71244625b8fe40b09fb4135569789' - 'fd7b9f632768f05a4e48c5996542191382d6530cff1fae1785cd6a8e6d48425a029b0cbf6a3b345f8b356fab3605bb00a64a88b6fae58949f2811b22735f534c' - '9fe042c385bc89a3b2f75f8f0fc4b95823136e6c0c64e763d783218498caadea36e5c23b2898390ea14ff47743cb61528854f7e7171ac815557ea9cfad15e9b5' - '72e50ba136d89eda9f97990fc9ba193f81cf7a84c00b40116a5fe6c668823a95e38d47a0ab452f00dbb03855eea17882f88d8ff25676fe0ba720c90202316a78' - '5dd005d447f02583a4d42bfee616eee92f74f42490343831842e58b5a1d8559f68605d93b8c30626b07dc83939b0e97d472ed6f6f7bc9ee52f43008edc143b06' - '808832a2d44e9ef4744222357bcf07f019f278eb69a0c77cfd420f924ad23749414e99ed48ec0af89ac5e2df202e522ed68de51e8bf97b492f6f499a3be7c5be' - '15d3e85812b78f120b1cb13feadd1a465b5cc91db2888a602bd68b3180d5631018114ecb99c6819df2a6626cf736add59eaf01dde585fede8f55fb173e39db40' - '359fabee10e9e5bb2130d918782c14007a70f2f912a1e683274ddb723cf10ce9fb256e6155ef299fa7bef5d85608a4c56faf91f951d269179c755068cb3d6583' - 'e5c161f7b3814c7d9a3ccd0f858406e9d625e950fd812482955f74eec291d50cb7a4cf06577fb286d2f4742f5c6d8afe7663024b3f4ffbba0d813e269bdf0e6f' - 'e1f2621207d7e4e2656c568de5953ffe6042d1490dc66fa96438ed2b5cb8cd946ffcd152f903a33f29b567a548f71b3c2426dc5b49d1dd4d227ddb3d18e6a9bd' - 'd0c0b6f17466d935170e873cbf8f28c9b685f7e1c79ba17d19b32cd03d8d727763b472038a8cafbfac7326f2d535b1707baa256c6f4ed86b99c58fcc653b5a80' - 'a6d0b22d607d4f9688336e9fa983d9d6664208645948c38d7565542d7e7003a0e8208d12bb768d84848721ef26cca6529bdac828d2713ec3c058fbf24bf9afde' - 'cb89874847428199071c9f1fc93cc7dbba2d061c427987ca5b7eb06d404fc149653feb2e2699e7a5fd9c32840a8d6a86470e4bdce103aa54e36bca4c66bc8c89' - '46f86a6b7e0f765cf62e4fcc1f79a55afe005a6b0fe532a1ac58099f550b6e726ff271c9e0833d1dc3880aa5e9cf86c78a759d3d83a2a2d022d1147c948de157' - '6577ee7d014b809a3a1d41edd57ade0fbac8743c545fc7fcbdd7641f8f8773a060d9f03e9e0472d32a2031d15cb8c00a4594992b0006e9e76d2e1f4133f4354f' - '7aa9ac637b3b8e087baae7046e437842f871324f883a94fce17f8efc2ce688cbc648687ba77c877c4beecf4dcff3147a849c11b434dae15a313974b53e845b45' - '135f129f2b72d99599ceb5c92f03d96dcef28465717eaaefd1a12a4f8617ede060150cb18caf7ae6ed6053210c32bba0bb5e742b5f99a20f9a1eaf1d86eca37b' - '4a54b2254d57c1947fb27728a173270a9f9504c4bca25e2e700c602e6b5b8b9d7538bbd4303c062a55b23cbfc8204975d9699dc82515a80e192295e75898acb5' - '728d23c27bb03fcda6c60f83623ac7e66b4e7788767d657def85e976b5eb578a0b0a03df5baa4688e39db4c9d7fe0c57dd7bb1a4baff44c8c5776071d393125b' - '623643cb84760e98a8265b617ac709d03c8e301f34837256b8c4a06e1a918656b1a90052d97b67e2a3ba23e0e499e8fc3285cdd558edb4b3e0ad0429f699cde3' - '7419835e5a02afa24780de1300f606fc2cb4c4872423f5a91ddbdfe6c2731f962adb769869f4e02381d5593bbf3683168eff562b6a2ab781a41a90ac535d6d23' - '18aeb54f46a35e9644bccf6035cfdad6e0448674f38c934857c9184f75ede1e74130e3bab3017b22d286d129680849622cc11a049859a1d14d7df8bf3e62ac8d' - '8b72e0772f1c7c4aa00fcd760bc04a3dae69335769d54e9368262fbded96ebf7308a671e46cbb6e921a043d6e297aa77a4510553fd5844f9ad742808b964a476' - 'f02addfac0f7e11c43b2f43e15d20f5e877c5300be6a5c23ae9d450096f064ebf597319228f81c7d5c6f598805050aff0431025600874e07a8b512e88fd3d083' - 'f94a708b8c08c416ee1e39207c32fff7c27749bd9025faa576a72493025786495851557251feccfa67fffbfd4a8cfeefaf25fc8a87c295af7be68b1d37d1e272' - 'f109e8d65417dbd3b0d8f5f37d1c5938d37a09f0387ecd75a690b88d365c56e231ff045010e0d6bfa1ec2c26898fd63a0577d207f837475df558746c46031646' - 'c9acc7a1ad4cb54868b0a66c0cf2cd6a3460acd6caee3c33331d0cd1894fe9142f1d5c3238c2b481bd80a390dc95d2c8feb513a2457ac86e28910d8ac968a4db' - '15bff4ec3b1bf8045a77cb7c5df6b07c8f0a4cf559490db126218b591e691fcc7cb26b3407ef16518d05609728bfa88f129f6df151133fb9e56fcb14d616bc4f' - '10166e70d170ca698d4354b2a60d3ce962281e6e41f12e713d18da269562571ce069b8464fc91777ff8c9c2674b1581d58edc36e80b6bc242d455e177f43207e' - '0c3c68ff09a02c01fe05d5e03598b551a91f025ba1366cecd443d6c54995a0334a89d746844698e6e1155a5acc1a857e6b5b3068c23f127047a72b29110955f1' - '911034e20151a17e787bc582668bc80323ff72503c0b905e4817a369f05dddf3f0c008e17193f415ae3625339265011f944a9002a1119a89205460a74834c0a4' - 'e5e656302cff207b53de54d7d090917193286c08ab584755ae3a7942a21beaddd24c02fa449640bf70f3fa2d5a0aeb3e2e8bbecf0d636c1355b4b38d0ab8f826' - 'ecc0e849166198def15a50aac46855be61acb65fbc63e74eb102293ce62e1320475b6700195feba835846130d597a9301455c4b77ed06a3396b5943be5a1590f' - 'f05bc3ca4e77a72909c14024fb801b67eb928ca0ea6dc7b8cc6a318e08ac6636f1e24d4584ef40d7f34cf012833f627479cef2abf730dbcdcb0b835375e40f60' - '536370b0615b373ee266bf39f434ee5ebec15d535e366fae99a68a2cc7ad75bd44f5abe41af7310b1d5e2e0762e783e4bb88fdd2c9de66f46ccab9c1e87f698e' - 'eb4e1894f408b7d90982a447183c3dbd702c654950c772c3adf6ac90be23655e6d6426210542de70682ba70797c247e6271bc7867fe2a8dc04ba8a63ab0e94c0' - '661acf4f1eeb803eabb4c5b8f9cfbbb6bd71eb456860fe23debf0de889d204aba490d545334098c8fd302de29b6adb5f1a75c4bd96e3fbd13f3dceec358a15ad') + '4553dd36a166eded64956870e200fa598111fb970780a2b97f56319a465bb357b81e726f05bbf98cd5c09954e7a19e879b1de3a405bc0445de91ca2b7c44f707' + '688e9fd15d629ab219a9234241bbc731cec59746bab60d1c2201046a58968c0afc2c7ac058501e5f206358b2e76af91ce926974bcbc82b6ca168d09a09ff4563' + 'edf8813fb11d6a7afd18b3d2253a41d1c4e450028dea2af61233e1602d98c65304038fabc0047c64aec91f65eb943b11b5b30662e4f3a44d21e04c74a4c50f14' + '4a208b9dff9389557f003f4637171b1e58eede69f2c875a5e9fedd488c3b80e84a7fe989d1e67c0b79e18e93df74ef04aa54d613cd1d01c8394a8d8f51531f82' + '99442d6032ee1a2824a0186a22b29748b1b69b7c59a616438ebc6ddce732437ef8b42e9de7b6034bd3f8c763aa725ff699ec6c608199e6cfcb2e79115b745748' + '1d6408eb0688fde1ffa1de6e791380f5e3fc222a5ca1a971a6e9e0a9444de82a3184824f1e95cee71a97a784557d59473e408efee6e33cc07f5f249ad6039475' + '1c99399e388c47516a22d879cc23b14578c28364f0e957d82a7b92e75ee66922f748790a6522e0fa02073a820dcf0c190e9fb2b9a2087ad65499af1f6caae61d' + 'c138049b26928ea03d9554f99a6fa42a641f1bd840e50f16bbf164f15e7a46696651f63fd170ad374ea9931cc61c903606e423a087c1f5fb82fe3b17387c90cd' + '2f289d2d43305b091787dbddd62d4c288e031608e4d3a8e73f99fabad1ee694c50d90d4c6c2fd7e14f5d6cbf6ea343cf794b98133744f7d2268c513d4e31aa31' + '6a8264a6ef7e8646dce804a1e8a9c5d789c1fb16c0237b799c0c4752037d7d9e7695bc63f73c56e63388e4b9f05561e14e434f5e3d6538debe05051630da0cc7' + 'c7342d1d4681106a01ecae25cfb1ee485172c9e7e36d10d0e227e24a1a5d4547f69f2f384c87839fcea1dbdb935f97e504d29e9cb0a39cfc6088282d3149c4ec' + 'df8f8a6d95c2d698427985daf5b6c5922a4201d5314005adf9d66aece66642901a0fc6dd01e4c34ba54ee7c196897f91c7beae69c7c09a2f040ff4f5bb03741d' + '08fe7553f916fe0f8057a206cd4f1327e7bb6293ca6254433c08a1113a5f7ba83d26bdc6e16915e61bcff9c31ea4b8ed7d7bceb204f1e9cf8815c930aeeca302' + 'cd50a58fab6fdb5f2ddb062526547981b44d1193463033d9ee5be7c54f1834adb2a5410da7236678d447442d470f2fb32b389e40fc0961b0d053b8f008ad7914' + '026ba038c4bfb2abd3f26c31ee826eed0d17d00d4ed1e58f25da2e6d6f297ad4e90c1e12d1b8e4e2b908b171ce0cbb4a1057354fc5cee66073c90311c7f54ae6' + '8d2d96feb83ce164a64ed755ffb48d7f036be8e6365b1e1785593cb7bb283efec7f44a6c72413f025fcb2ec2c1a011cb335393fb89207f5f7f30b65e31a0c5a0' + '7552962ef95cfca777c57f4b8109b6ceb0de35387878d140ec4dbcfca556a3d640a0f0049177448d32cce48c17705caa112ceb6409e87c278acbed4f4d3a20f5' + 'bb5fb42d34b405058c97e7e329a64c9892bdbfe530748167dec283eb34086cd2be772f54e2d56714eda85939fd54faba7f14677c66817d6573faff541d4f561a' + 'e34b4c6c5037401c4d6acb9d64b5984d18ae03c905360f2ae9504dea79afa4e0e9e9d2b93cd1cec843f0eb56945f9fc5070136eff9e4309163ebc4e88de376ac' + 'ebfce61496f2c7c202961be85e4da5aa488b1a91021bf911891cff40c32a3abf0bcc665e6c4d0c07d0778eccd0d61df5fd52163f00ab3b914637f705fcb44a65' + 'e1ecfdba4e0732a61c61bb931fac430f09642d7641e3cb3da4ec680ca1553a613a49937613a70a520aed158ffdf7f64ca9359c888e11563ab2941101361c29a4' + '163daaaa076f00ee23ab0271249fa7a9c175b6a411f8d3309751e41f02c1f405531b0bb2ae0a29fdad6049ef9c4c8d71bbe479f084e7c98b56bf3be3ab3bda2d' + 'cc336b67d0be16c82b4b3fac0bb5fe16f2c6f6fa711c5c0701970a37d75fc4c7869b329183471decd051566bdbedbacb360e49a283c1c116adf881de717745ce' + '09e0f9f0a23c2c52e399d9999873d92893a49c829619861b4f0f72d0dad12b638403626519097e6bd059166752d100c9bda9a4f8a4f47a21478646daf66dc610' + '4b9b3da0cdba5df1a505cd730073d2e8887d4099fdfe7fd5a0f914db2f4e73fab2da47286a84f2eea0bdbbcfd5585f425928b29e7d09f1f050eaf9d3480c036d' + '8975e87497557b9b427ff002d2fd156d2ef4e4b0036836af993f1a7b9c73c632c05d424bdc4e6359f6045bbea725ab3dee993e978b020f0480a1acd96395b2ce' + '3dd3929b600aab5d1a5c9f489fa326b48eb4de1740579e0d948d8b72aa2fb50e73bf337014be7d892c23cd1b2ab36a13d52da9b10dc4e5a220dff06dcf16afc9' + 'b02f671ce57339f85098afb41e27b09a516cd903906bd34dfbe199525fecd73cd0bca978464fddef302f38ccab1bc14d862840677e7fbdb1ba9fd20ea754280d' + '746dcb7d355c429fd4c6b633885a86eeb37e300a738c5bcbda4ca91ac0f6ededcf915e9d6a5de54bf7b3c2e463cd86d2cdb7ec2342173ed1836ab19f1137a880' + '028839eca290eb7b02c83bb1bb40ec0f35dcae7d446c06f0366ab7cc17c1bdb0adc0bd72a5a71b6b67a4deb607befd2c5de0372c695d3a1ced5407f8c853fae6' + 'e5add42b6ea194cf5b56c7a90118a4cfabdedfac40d718fb3214c6414f5ed6f0427b3eb9de7c91428f0edcc1364637b04c8ed43ecf5847997d892520ac945822' + '16871831e5b92d8721d52c72afc0af6df0a7048e58e6f59bff8ad09b6aee00c0090c465d00f9501ce0f53d3b10b905bfaa1571d3d3e9006385bd22cd1abc0af8' + '17d1bf8d5ca0aedb25bad3e61f4bfb098830a87d95ace1dd2d90fadc030e7bf668c7cceea170ea7d13d7cb80c6e3e36b6749cdf52b970150dc5ea6b9ae1a6bbe' + '8f473a1b0ffd9feec15e415f0c34ba69609e8a8ab271f3b36dacd4866f02affeeb73e4bb975db2375ce051f59969e54fe577591e9f6810e4a5440c659f4c9431' + 'b09cb2fb7b904d2048f1c37e4dfb74b9adf4b0b21023c55551ae51121acea85198a594701396e0d9058c267b83e8c1f2e6fc5b31f8fca8b001ed23f4cb5883e9' + 'b02d01ef4f9b75a2d103ad499120cd0f9d01ae2b74d8a922463c2c2d42ddc6dfe73dc7ecf51d7c8f5be235107bb1f8c7b484d747e39bd576165eafab2a0edfbb' + '777dd7242a23724a4ce559164c0ee20243fa137e99a7a9c31b1e99587606dcd66fe7d39a89a799ca294b9abdb537da5ede605eaca85b19a35f0cab99b7a11a5f' + '8c9a2e6597246a166e0e5a51ec6309035788925e41a115e8e6b489fe1f6e6d528cf4ef535a010d83260a0f0aac375589e4bbdf711fa9b38b15980cb4db43d73e' + '1fe409f22f094f9c5b2cc70561650ad4563836ab8a3c5cce846376f53572838a93cca38810e75f2b6d19bc44b156e9341f2ae05b5832ef7844b703ce922b3416' + '42539e633382f62b7fc4adf26a87b0842071077f7e6c6262b78f9174b969dc16ec79640cd7990c0bf6761c14f848792f32c9140248d734d97178566417069691' + 'd3229b79de9b89f4d668e520f80376ab1a88fc7f160c0d5c105ce4b1ce4fb6293d55368eac7d85a2bee929403386c4ccb143be7656d325ad0ec5e0759885de2c' + '580a7d4ccda3fa278647e6c1354cb9e70737ab6ca4fdf1ea2f335808f46369ca8908a77511dc0ca48c99beb45824afd708c9abb8617c8ff842c7547f2cf62f1a' + '9934e0042db3801c2fad3a2754d19f640354128dd376fc1db835b253c48cc83639be08de0162533e47db48d7869e689767cacad6ebaf136e22b831af587f6cb0' + '8f225825aef220b637fddab316e49d9a05535b19a83e224d6f7fbc88b56d100e8659e9c51658d2d6d082ce02b5db4ca4a4cfa94c3039a22d68df5c942ad28fc2' + '1301414761d65b83d01b2605a70355b522bf66a2b9a01f7cebae46f8ba1aaf131d98b2989e2e740de2f11cb69067192db2156c286056ddec50bb42475a98641f' + '582a2a94f3a472a930561d0a2d297d30d0444673b3d188e6cb3c49999c99a90783dd9671329db625a619ed349b016ab0a1638ace68be065fe2785829d90fff0e' + 'fbda48a6f95cca8f7d02cebda30d2a129b113d4dceda4ea3a4fb1bdec837f61c91e39baf1a3677e0fd16cad49a07a59d8db9ff44d810bddd6af00b7a9981c048' + '3c48f173e48e67a66668af76008da90092fc02c77ec8625fba28218fc693931ff8658adc5913e318900b02ae04131cba1201ba68c7536a1cf8470d38bcc8eeaa' + 'c80e6909801c63c0db8e7423248e74bf634bb6efe14ba8e04ec69f9d1e95a1b8a4f37b44144e3889c3daba6ba2871542093259ffa62dc6e981c05a25bbbe154f' + 'dbc3f1a5b827d249ea7899ea67ceff9055eaeb7fb94c268d26829a056b7e377eea20ac64e685133ffa0418fec3b5114fdac53cb4f21de3006ee0994955f473da' + '8fb14d376d25fc7690eb9d7cac23e12935d39809d481bd37038cf5993996e8da9af91369521e736f09e13891dbe2b6ff87538222500feda2166b73798ac5cc0e' + '935bc5c8c88c159c1a7179aab69dd1d3ea6507067a9341760ee6e8e3a6fe0a25d8b439d92072b031cf8a675bb47bd7b4d56c26da6a5ab738402247ee4941c497' + 'fa96809c273f08e93ee833eb64b923eb50c25a216ef69550dbdf7900d801dbe8baa4b87c00f1d08b0f805a7ba638174f03a5bd74db64e8eb7cb5bedab089d2bc' + '5a0ff4c52e61dbbbf87a3b012a3031f23a993d9287bda6cb9428e1de36bd0ccf93f0e1e7691fb234e696ac69587d99eff214699c7f0019ae261242b80b0662f7' + 'c29b762cbcc86b7cf732207a86fb04f548d7e2de8051381a99590e02f49a310fa647af08455172f44f74c095ced5ec301133f82c2d3151534da8903d6c73f6bb' + 'aead8781d882e5afb0a3751ebb37dc06e510b028e03f8653d197c7cb6070f958e023d8a59e3855bfcf87be4cfaa3901e53f76ae7413c84800f4991ca196790f5' + 'ac7714861e3384d0811eb6becd95d5da87bac4de8df2f78aa103972918259cf3e0947cbfa47eb355463aab3aa4be5abe80e127a61bf880994e192d635440636c' + 'ebd44f3cf3c257fec075c7697246337bfc1fd6f0866947457f975a62e2d57299e77b4e31b72b8340dffb494c1cbd804e773fc0f462d0ec7ee58573ceea027703' + 'c9c88a315305f76172c7df4dabff7cdb399e2eeb661cfb3b14bf489ca3ec004dc61dd70752436c9b318afa23b3984e697344b1cb1fcaeb7cb0fc92e11fa9de27' + '00959d85d4cf38e203bd27dc1506ea4e4b326fdd3fee6973282180c0c04fcd1a3ff41e196f78c924fb7a666cf644f335523072e19a5a2790d642d1c97839e6e9' + 'd854fb027d13d24fa4f4783880f76531c2a08bbab5cab5bc041e42ac36954923b797024d99d7c36c032565d5155d6c2d147743cc425ebd8ac2bcfc2179110899' + '647dfe19d2866e1455d9c21ff0576f7a6ee5a780f5d07ca11cc02bade2a50cf42f21270d573f74258feba2a9adbede415fa4ae4a71e87f77a133e8931c259b47' + '162d5a7ef2e84e55424a6fcb14d18999d0b4c781045180a30394d7f767507dc6b1b084b2d4f3bed63b11d605560bf1fd59fbed7ed0d1e0dce6e47511ed7e6a8e') # vim:set sw=2 et: